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) (show 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
@@ -1,9 +1,9 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.0-rc4 Kernel Configuration
+# Linux/arm 3.4.0-rc5 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_GENERIC_GPIO=y
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -1135,13 +1135,13 @@ CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y
CONFIG_WEXT_SPY=y
CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
+CONFIG_NL80211_TESTMODE=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
# CONFIG_CFG80211_INTERNAL_REGDB is not set
CONFIG_CFG80211_WEXT=y
@@ -1311,13 +1311,13 @@ CONFIG_MTD_ONENAND_OMAP2=y
#
CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_UBI=y
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
CONFIG_DTC=y
CONFIG_OF=y
#
# Device Tree and Open Firmware support
@@ -1655,16 +1655,19 @@ CONFIG_LIBERTAS_DEBUG=y
# CONFIG_RT2X00 is not set
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
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
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
#
@@ -2171,13 +2174,13 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
# CONFIG_DW_WATCHDOG is not set
# CONFIG_MPCORE_WATCHDOG is not set
CONFIG_OMAP_WATCHDOG=y
-CONFIG_TWL4030_WATCHDOG=y
+CONFIG_TWL4030_WATCHDOG=m
# CONFIG_MAX63XX_WATCHDOG is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
@@ -3310,17 +3313,18 @@ CONFIG_DRM_OMAP_NUM_CRTCS=1
# Android
#
# CONFIG_ANDROID is not set
CONFIG_PHONE=m
CONFIG_USB_WPAN_HCD=m
CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HWSPINLOCK=m
#
# Hardware Spinlock drivers
#
-# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HWSPINLOCK_OMAP=m
CONFIG_CLKSRC_MMIO=y
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y
CONFIG_OMAP_IOMMU=y
# CONFIG_OMAP_IOVMM is not set