summaryrefslogtreecommitdiffstats
path: root/config-arm-omap
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2012-06-05 13:33:59 +0100
committerPeter Robinson <pbrobinson@gmail.com>2012-06-05 13:33:59 +0100
commit4ee438e84aa8bee5a65d27076ef3436e1337a0e2 (patch)
tree46f9c27a8c20187b8b1ea1a4b60e1847bd3eff10 /config-arm-omap
parent48d35dba7a308ba6c6d97d99f7a3bd62b2d8cead (diff)
downloadkernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.tar.gz
kernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.tar.xz
kernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.zip
Update ARM config options for 3.5, Enable MTD/UBI/JFFS2 on ARM platforms
Diffstat (limited to 'config-arm-omap')
-rw-r--r--config-arm-omap5
1 files changed, 2 insertions, 3 deletions
diff --git a/config-arm-omap b/config-arm-omap
index 3513ef062..d0fb63a20 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -42,7 +42,7 @@ CONFIG_SOC_OMAP3430=y
CONFIG_OMAP_PACKAGE_CBB=y
CONFIG_OMAP_PACKAGE_CBL=y
CONFIG_OMAP_PACKAGE_CBS=y
-CONFIG_OMAP4_ERRATA_I688=y
+# CONFIG_OMAP4_ERRATA_I688 is not set
#
# OMAP Board Type
@@ -115,8 +115,6 @@ CONFIG_ARM_ERRATA_720789=y
# CONFIG_ARM_ERRATA_754327 is not set
# CONFIG_ARM_ERRATA_764369 is not set
CONFIG_ARM_GIC=y
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_PCCARD is not set
CONFIG_HAVE_ARM_SCU=y
CONFIG_HAVE_ARM_TWD=y
CONFIG_HOTPLUG_CPU=y
@@ -156,6 +154,7 @@ CONFIG_WL12XX_SDIO_TEST=m
CONFIG_INPUT_TWL4030_PWRBUTTON=m
CONFIG_INPUT_TWL4030_VIBRA=m
CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_KEYBOARD_OMAP4=m
CONFIG_TOUCHSCREEN_TI_TSCADC=m
CONFIG_SERIAL_OMAP=y
CONFIG_SERIAL_OMAP_CONSOLE=y