Home Home > GIT Browse
summaryrefslogtreecommitdiff
authorGuillaume GARDET <guillaume.gardet@opensuse.org>2012-05-03 09:49:05 (GMT)
committer Jeff Mahoney <jeffm@suse.com>2012-05-03 16:34:52 (GMT)
commitdb627f7ca6fb915b4c851f79607d5f1952fcc725 (patch) (side-by-side diff)
tree7399ba2d07322b9267144fd7452161e13301e1cd
parente0eb7357505019bfac96bbc0ee14056abc1bb8c6 (diff)
Update config/armv7l/omap2plus
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--config/armv7l/omap2plus20
1 files changed, 12 insertions, 8 deletions
diff --git a/config/armv7l/omap2plus b/config/armv7l/omap2plus
index a9634f1..a4b8177 100644
--- a/config/armv7l/omap2plus
+++ b/config/armv7l/omap2plus
@@ -2,3 +2,3 @@
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.0-rc4 Kernel Configuration
+# Linux/arm 3.4.0-rc5 Kernel Configuration
#
@@ -1140,3 +1140,3 @@ CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
+CONFIG_NL80211_TESTMODE=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -1316,3 +1316,3 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_GLUEBI=m
# CONFIG_MTD_UBI_DEBUG is not set
@@ -1660,6 +1660,9 @@ CONFIG_RTL8192C_COMMON=m
CONFIG_WL1251=m
-# CONFIG_WL1251_SPI is not set
-# CONFIG_WL1251_SDIO is not set
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
CONFIG_WL12XX_MENU=m
-# CONFIG_WL12XX is not set
+CONFIG_WL12XX=m
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
@@ -2176,3 +2179,3 @@ CONFIG_SOFT_WATCHDOG=m
CONFIG_OMAP_WATCHDOG=y
-CONFIG_TWL4030_WATCHDOG=y
+CONFIG_TWL4030_WATCHDOG=m
# CONFIG_MAX63XX_WATCHDOG is not set
@@ -3315,2 +3318,3 @@ CONFIG_USB_WPAN_HCD=m
CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HWSPINLOCK=m
@@ -3319,3 +3323,3 @@ CONFIG_CLKDEV_LOOKUP=y
#
-# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HWSPINLOCK_OMAP=m
CONFIG_CLKSRC_MMIO=y