summaryrefslogtreecommitdiffstats
path: root/config-arm-omap-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-03 09:28:35 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-11-03 09:30:13 -0400
commit6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1 (patch)
tree8d016b24d1c470ab8ce72ec936f60317dcd028f6 /config-arm-omap-generic
parent906f34d53bd601a61ff7567e00495c78aa5f62ef (diff)
downloadkernel-6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1.tar.gz
kernel-6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1.tar.xz
kernel-6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1.zip
Linux 3.1-git5 (upstream 43672a0784707)
Diffstat (limited to 'config-arm-omap-generic')
-rw-r--r--config-arm-omap-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index d836a9082..504497e86 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -94,6 +94,7 @@ CONFIG_MACH_OMAP_3630SDP=y
CONFIG_MACH_OMAP_4430SDP=y
CONFIG_MACH_OMAP4_PANDA=y
CONFIG_MACH_TI8168EVM=y
+CONFIG_MACH_OMAP_GENERIC=y
CONFIG_OMAP3_EMU=y
# CONFIG_OMAP3_SDRC_AC_TIMING is not set
# System MMU
@@ -630,6 +631,7 @@ CONFIG_REGULATOR_TWL4030=y
# CONFIG_REGULATOR_ISL6271A is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_GPIO is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_RC_CORE=y
CONFIG_LIRC=y