summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@mvista.com>2006-10-16 16:55:56 -0700
committerKevin Hilman <khilman@mvista.com>2006-10-16 16:55:56 -0700
commit82f5d268ba45caecdf5c99bc61a421a0df7e69f1 (patch)
treecae41d8c59b98ffc69cea80910e093c03c157f8d
parent720bd00374cc5836035d0f1b00a18d947dd49dc3 (diff)
ARM: DaVinci: Update default config to enable AIC33 for audio supportv2.6.18-davinci1
Signed-off-by: Kevin Hilman <khilman@mvista.com>
-rw-r--r--arch/arm/configs/davinci_evm_dm644x_defconfig18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/configs/davinci_evm_dm644x_defconfig b/arch/arm/configs/davinci_evm_dm644x_defconfig
index 174ca291d643..63cd4991670e 100644
--- a/arch/arm/configs/davinci_evm_dm644x_defconfig
+++ b/arch/arm/configs/davinci_evm_dm644x_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc6-omap1
-# Wed Sep 6 10:06:24 2006
+# Linux kernel version: 2.6.18-omap1
+# Mon Oct 16 16:52:57 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -31,15 +31,15 @@ CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
-CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
@@ -47,12 +47,12 @@ CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set
@@ -321,7 +321,6 @@ CONFIG_NETFILTER=y
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
@@ -409,7 +408,7 @@ CONFIG_MTD_CFI_UTIL=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0x8000000
-CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_PLATRAM is not set
@@ -769,8 +768,9 @@ CONFIG_I2C_DAVINCI=y
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
+CONFIG_SENSORS_TLV320AIC23=y
# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_TLV320AIC33 is not set
+CONFIG_SENSORS_TLV320AIC33=y
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
@@ -971,7 +971,7 @@ CONFIG_SOUND_PRIME=y
# CONFIG_SOUND_MSNDPIN is not set
# CONFIG_SOUND_TVMIXER is not set
CONFIG_SOUND_DAVINCI=y
-# CONFIG_SOUND_DAVINCI_AIC33 is not set
+CONFIG_SOUND_DAVINCI_AIC33=y
#
# DaVinci Audio Options