Home Home > GIT Browse

Tools

Branches

openSUSE

Upstream

SLE

summaryrefslogtreecommitdiff
Unidiff
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
@@ -1,5 +1,5 @@
1# 1#
2# Automatically generated file; DO NOT EDIT. 2# Automatically generated file; DO NOT EDIT.
3# Linux/arm 3.4.0-rc4 Kernel Configuration 3# Linux/arm 3.4.0-rc5 Kernel Configuration
4# 4#
5CONFIG_ARM=y 5CONFIG_ARM=y
@@ -1139,5 +1139,5 @@ CONFIG_WEXT_SPY=y
1139CONFIG_WEXT_PRIV=y 1139CONFIG_WEXT_PRIV=y
1140CONFIG_CFG80211=m 1140CONFIG_CFG80211=m
1141# CONFIG_NL80211_TESTMODE is not set 1141CONFIG_NL80211_TESTMODE=y
1142# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set 1142# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
1143# CONFIG_CFG80211_REG_DEBUG is not set 1143# CONFIG_CFG80211_REG_DEBUG is not set
@@ -1315,5 +1315,5 @@ CONFIG_MTD_UBI=y
1315CONFIG_MTD_UBI_WL_THRESHOLD=4096 1315CONFIG_MTD_UBI_WL_THRESHOLD=4096
1316CONFIG_MTD_UBI_BEB_RESERVE=1 1316CONFIG_MTD_UBI_BEB_RESERVE=1
1317# CONFIG_MTD_UBI_GLUEBI is not set 1317CONFIG_MTD_UBI_GLUEBI=m
1318# CONFIG_MTD_UBI_DEBUG is not set 1318# CONFIG_MTD_UBI_DEBUG is not set
1319CONFIG_DTC=y 1319CONFIG_DTC=y
@@ -1659,8 +1659,11 @@ CONFIG_RTLWIFI=m
1659CONFIG_RTL8192C_COMMON=m 1659CONFIG_RTL8192C_COMMON=m
1660CONFIG_WL1251=m 1660CONFIG_WL1251=m
1661# CONFIG_WL1251_SPI is not set 1661CONFIG_WL1251_SPI=m
1662# CONFIG_WL1251_SDIO is not set 1662CONFIG_WL1251_SDIO=m
1663CONFIG_WL12XX_MENU=m 1663CONFIG_WL12XX_MENU=m
1664# CONFIG_WL12XX is not set 1664CONFIG_WL12XX=m
1665CONFIG_WL12XX_SPI=m
1666CONFIG_WL12XX_SDIO=m
1667CONFIG_WL12XX_PLATFORM_DATA=y
1665CONFIG_ZD1211RW=m 1668CONFIG_ZD1211RW=m
1666# CONFIG_ZD1211RW_DEBUG is not set 1669# CONFIG_ZD1211RW_DEBUG is not set
@@ -2175,5 +2178,5 @@ CONFIG_SOFT_WATCHDOG=m
2175# CONFIG_MPCORE_WATCHDOG is not set 2178# CONFIG_MPCORE_WATCHDOG is not set
2176CONFIG_OMAP_WATCHDOG=y 2179CONFIG_OMAP_WATCHDOG=y
2177CONFIG_TWL4030_WATCHDOG=y 2180CONFIG_TWL4030_WATCHDOG=m
2178# CONFIG_MAX63XX_WATCHDOG is not set 2181# CONFIG_MAX63XX_WATCHDOG is not set
2179 2182
@@ -3314,9 +3317,10 @@ CONFIG_PHONE=m
3314CONFIG_USB_WPAN_HCD=m 3317CONFIG_USB_WPAN_HCD=m
3315CONFIG_CLKDEV_LOOKUP=y 3318CONFIG_CLKDEV_LOOKUP=y
3319CONFIG_HWSPINLOCK=m
3316 3320
3317# 3321#
3318# Hardware Spinlock drivers 3322# Hardware Spinlock drivers
3319# 3323#
3320# CONFIG_HWSPINLOCK_OMAP is not set 3324CONFIG_HWSPINLOCK_OMAP=m
3321CONFIG_CLKSRC_MMIO=y 3325CONFIG_CLKSRC_MMIO=y
3322CONFIG_IOMMU_API=y 3326CONFIG_IOMMU_API=y