summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2012-09-04 08:32:15 +0100
committerJosh Boyer <jwboyer@redhat.com>2012-09-04 08:52:54 -0400
commit1b72b444f0ff50136c819be540b67ecddbf815df (patch)
tree183e44d55fbc499f048e52f6b999658ff980118b
parent166ea25781e8219f0fad8ba564b936f8a77b30ea (diff)
downloadkernel-1b72b444f0ff50136c819be540b67ecddbf815df.tar.gz
kernel-1b72b444f0ff50136c819be540b67ecddbf815df.tar.xz
kernel-1b72b444f0ff50136c819be540b67ecddbf815df.zip
Tweak OMAP options
-rw-r--r--config-arm-omap11
-rw-r--r--kernel.spec3
2 files changed, 9 insertions, 5 deletions
diff --git a/config-arm-omap b/config-arm-omap
index 36041f82d..b44a44590 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 4b2c975a6..7c7a52597 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2315,6 +2315,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Sep 4 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Tweak OMAP options
+
* Mon Sep 03 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc4.git0.1
- Linux v3.6-rc4
- Disable debugging options.