summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRicardo Perez Olivares <x0081762@ti.com>2010-07-10 05:15:22 -0500
committerRicardo Perez Olivares <x0081762@ti.com>2010-07-10 05:15:22 -0500
commitc7aeb1b5ce92a63d9146765588528a217b3eb0d8 (patch)
tree23f2eda6b685fe804e0a899ddb86c3d549331d47 /arch/arm
parentc3d614183103bcae3cf1f805f213de65effe3616 (diff)
OMAP4: omap_4430sdp_defconfig: Aligning .config and defconfig
Aligning .config and defconfig files Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
Diffstat (limited to 'arch/arm')
-rwxr-xr-xarch/arm/configs/omap_4430sdp_defconfig12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig
index 0a3f8f234618..c0c76eaf3ed3 100755
--- a/arch/arm/configs/omap_4430sdp_defconfig
+++ b/arch/arm/configs/omap_4430sdp_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34
-# Sat Jul 10 04:10:02 2010
+# Sat Jul 10 05:15:05 2010
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -1135,8 +1135,8 @@ CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_SOUND_OSS_CORE is not set
CONFIG_SOUND=y
+# CONFIG_SOUND_OSS_CORE is not set
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
@@ -1161,15 +1161,17 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_MPU401 is not set
CONFIG_SND_ARM=y
CONFIG_SND_SPI=y
-# CONFIG_SND_SOC is not set
CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_MCPDM=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_OMAP_MCPDM=y
+CONFIG_SND_OMAP_SOC_ABE=y
CONFIG_SND_OMAP_SOC_SDP4430=y
CONFIG_SND_OMAP_SOC_HDMI=y
+# CONFIG_SND_OMAP_VOICE_TEST is not set
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_TWL6040=y
+CONFIG_SND_SOC_ABE_TWL6040=y
# CONFIG_SOUND_PRIME is not set
# CONFIG_HID_SUPPORT is not set
CONFIG_USB_SUPPORT=y