summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/ams_delta_defconfig
diff options
context:
space:
mode:
authorTony Lindgren2010-05-20 20:07:23 +0200
committerTony Lindgren2010-05-20 20:07:23 +0200
commitdf760137ad3cbfa15ceed42478f81bff01b6e799 (patch)
treebe939c9d11094858d74141a4c62cb23f477754d8 /arch/arm/configs/ams_delta_defconfig
parentOMAP1: Amstrad Delta: modify defconfig for external keyboardsupport (diff)
parentAM35x: fix UI card EHCI port and LCD dependency (diff)
downloadkernel-qcow2-linux-df760137ad3cbfa15ceed42478f81bff01b6e799.tar.gz
kernel-qcow2-linux-df760137ad3cbfa15ceed42478f81bff01b6e799.tar.xz
kernel-qcow2-linux-df760137ad3cbfa15ceed42478f81bff01b6e799.zip
Merge branch 'omap-boards' into omap-for-linus
Diffstat (limited to 'arch/arm/configs/ams_delta_defconfig')
-rw-r--r--arch/arm/configs/ams_delta_defconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig
index ecf45fbff956..6d8a0c891f80 100644
--- a/arch/arm/configs/ams_delta_defconfig
+++ b/arch/arm/configs/ams_delta_defconfig
@@ -47,6 +47,7 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
+CONFIG_TREE_PREEMPT_RCU=y
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED=y
@@ -95,9 +96,8 @@ CONFIG_KMOD=y
# Block layer
#
CONFIG_BLOCK=y
-# CONFIG_LBD is not set
+# CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
#
# IO Schedulers
@@ -836,7 +836,8 @@ CONFIG_DAB=y
#
# Graphics support
#
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
#
# Display device support
@@ -1284,7 +1285,7 @@ CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set