diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-05-01 16:41:06 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-05-01 16:41:06 +0000 |
| commit | 8022e97c116af8ac1433db41dbe70f7fdf56cee1 (patch) | |
| tree | 86b5864b114bc42b71cfc0b6cd9f7d1eb139e552 /packages/linux | |
| parent | 93e261aa5a108614f041be38934ddb29b5e6e911 (diff) | |
| parent | 9c4f5f2745e24cf8e99e63e345ed8408f0a7c06b (diff) | |
merge of '4628771529e2ed24d72e3df800feb7a575c330e7'
and 'c18c0af8649c4f70f923fefaa9e42158e83c3881'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01 | 24 | ||||
| -rw-r--r-- | packages/linux/linux-gta01_2.6.21.1.bb | 2 |
2 files changed, 20 insertions, 6 deletions
diff --git a/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01 index 1a38fe6287..276b6e5b23 100644 --- a/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01 +++ b/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21.1 -# Mon Apr 30 14:02:17 2007 +# Tue May 1 09:19:54 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -33,7 +33,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="-moko9" +CONFIG_LOCALVERSION="-moko10" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -168,7 +168,7 @@ CONFIG_S3C2410_CLOCK=y # CONFIG_MACH_AML_M5900 is not set # CONFIG_MACH_VR1000 is not set # CONFIG_MACH_QT2410 is not set -CONFIG_MACH_GTA01=y +CONFIG_MACH_NEO1973_GTA01=y # # S3C2412 Machines @@ -276,7 +276,7 @@ CONFIG_FPE_FASTFPE=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set +CONFIG_BINFMT_MISC=m # # Power management options @@ -1126,7 +1126,7 @@ CONFIG_LEDS_CLASS=y # # LED drivers # -CONFIG_LEDS_S3C24XX=m +# CONFIG_LEDS_S3C24XX is not set CONFIG_LEDS_GTA01=y # @@ -1255,10 +1255,24 @@ CONFIG_SND_SOC=y # # +# SoC Audio for the Freescale i.MX +# + +# # SoC Audio for the Intel PXA2xx # # +# SoC Audio for the Samsung S3C24XX +# +CONFIG_SND_S3C24XX_SOC=y +CONFIG_SND_S3C24XX_SOC_I2S=y +CONFIG_SND_S3C24XX_SOC_SMDK2440=m +CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y +CONFIG_SND_SOC_WM8753=y +CONFIG_SND_SOC_UDA1380=m + +# # Open Sound System # # CONFIG_SOUND_PRIME is not set diff --git a/packages/linux/linux-gta01_2.6.21.1.bb b/packages/linux/linux-gta01_2.6.21.1.bb index 59859db5e0..a9bf11126b 100644 --- a/packages/linux/linux-gta01_2.6.21.1.bb +++ b/packages/linux/linux-gta01_2.6.21.1.bb @@ -2,7 +2,7 @@ require linux-gta01.inc DEFAULT_PREFERENCE = "-6" -MOKOR = "moko9" +MOKOR = "moko10" PR = "${MOKOR}-r0" VANILLA_VERSION = "2.6.21.1" |