From 6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Thu, 3 Nov 2011 09:28:35 -0400
Subject: Linux 3.1-git5 (upstream 43672a0784707)

---
 config-arm-omap-generic | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config-arm-omap-generic')

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
-- 
cgit