[kernel] Tweak OMAP options

[Josh Boyer]

commit 1b72b444f0ff50136c819be540b67ecddbf815df
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 4 08:32:15 2012 +0100

    Tweak OMAP options

 config-arm-omap |   11 ++++++-----
 kernel.spec     |    3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/config-arm-omap b/config-arm-omap
index 36041f8..b44a445 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -145,6 +145,7 @@ CONFIG_PM_OPP=y
 #
 # OMAP Hardware
 #
+CONFIG_WL_TI=y
 CONFIG_TI_ST=m
 CONFIG_GPIOLIB=y
 CONFIG_MTD_NAND_OMAP2=y
@@ -162,18 +163,18 @@ CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_CORE=y
-# CONFIG_TWL4030_MADC is not set
+CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_CODEC=y
 CONFIG_GPIO_TWL4030=m
 CONFIG_CHARGER_TWL4030=m
-# CONFIG_TWL6030_PWM is not set
+CONFIG_TWL6030_PWM=m
 
 CONFIG_MTD_ONENAND_OMAP2=y
 CONFIG_I2C_OMAP=y
 CONFIG_SPI_OMAP24XX=y
-# CONFIG_MFD_OMAP_USB_HOST is not set
-# CONFIG_MFD_WL1273_CORE is not set
+CONFIG_MFD_OMAP_USB_HOST=m
+CONFIG_MFD_WL1273_CORE=m
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_VIDEO_OMAP2_VOUT=m
 # CONFIG_VIDEO_OMAP3 is not set
@@ -236,7 +237,7 @@ CONFIG_USB_OTG=y
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
 CONFIG_USB_MUSB_HDRC=y
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_MUSB_DEBUG is not set
 #
 
diff --git a/kernel.spec b/kernel.spec
index 4b2c975..7c7a525 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2315,6 +2315,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Sep  4 2012 Peter Robinson <pbrobinson at fedoraproject.org>
+- Tweak OMAP options
+
 * Mon Sep 03 2012 Josh Boyer <jwboyer at redhat.com> - 3.6.0-0.rc4.git0.1
 - Linux v3.6-rc4
 - Disable debugging options.