Home| summaryrefslogtreecommitdiff |
| author | Guillaume 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) |
| commit | db627f7ca6fb915b4c851f79607d5f1952fcc725 (patch) (unidiff) | |
| tree | 7399ba2d07322b9267144fd7452161e13301e1cd | |
| parent | e0eb7357505019bfac96bbc0ee14056abc1bb8c6 (diff) | |
Update config/armv7l/omap2plus
| -rw-r--r-- | config/armv7l/omap2plus | 20 |
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 @@ | |||
| 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 | # |
| @@ -1140,3 +1140,3 @@ CONFIG_WEXT_PRIV=y | |||
| 1140 | CONFIG_CFG80211=m | 1140 | CONFIG_CFG80211=m |
| 1141 | # CONFIG_NL80211_TESTMODE is not set | 1141 | CONFIG_NL80211_TESTMODE=y |
| 1142 | # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set | 1142 | # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set |
| @@ -1316,3 +1316,3 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 | |||
| 1316 | CONFIG_MTD_UBI_BEB_RESERVE=1 | 1316 | CONFIG_MTD_UBI_BEB_RESERVE=1 |
| 1317 | # CONFIG_MTD_UBI_GLUEBI is not set | 1317 | CONFIG_MTD_UBI_GLUEBI=m |
| 1318 | # CONFIG_MTD_UBI_DEBUG is not set | 1318 | # CONFIG_MTD_UBI_DEBUG is not set |
| @@ -1660,6 +1660,9 @@ CONFIG_RTL8192C_COMMON=m | |||
| 1660 | CONFIG_WL1251=m | 1660 | CONFIG_WL1251=m |
| 1661 | # CONFIG_WL1251_SPI is not set | 1661 | CONFIG_WL1251_SPI=m |
| 1662 | # CONFIG_WL1251_SDIO is not set | 1662 | CONFIG_WL1251_SDIO=m |
| 1663 | CONFIG_WL12XX_MENU=m | 1663 | CONFIG_WL12XX_MENU=m |
| 1664 | # CONFIG_WL12XX is not set | 1664 | CONFIG_WL12XX=m |
| 1665 | CONFIG_WL12XX_SPI=m | ||
| 1666 | CONFIG_WL12XX_SDIO=m | ||
| 1667 | CONFIG_WL12XX_PLATFORM_DATA=y | ||
| 1665 | CONFIG_ZD1211RW=m | 1668 | CONFIG_ZD1211RW=m |
| @@ -2176,3 +2179,3 @@ CONFIG_SOFT_WATCHDOG=m | |||
| 2176 | CONFIG_OMAP_WATCHDOG=y | 2179 | CONFIG_OMAP_WATCHDOG=y |
| 2177 | CONFIG_TWL4030_WATCHDOG=y | 2180 | CONFIG_TWL4030_WATCHDOG=m |
| 2178 | # CONFIG_MAX63XX_WATCHDOG is not set | 2181 | # CONFIG_MAX63XX_WATCHDOG is not set |
| @@ -3315,2 +3318,3 @@ CONFIG_USB_WPAN_HCD=m | |||
| 3315 | CONFIG_CLKDEV_LOOKUP=y | 3318 | CONFIG_CLKDEV_LOOKUP=y |
| 3319 | CONFIG_HWSPINLOCK=m | ||
| 3316 | 3320 | ||
| @@ -3319,3 +3323,3 @@ CONFIG_CLKDEV_LOOKUP=y | |||
| 3319 | # | 3323 | # |
| 3320 | # CONFIG_HWSPINLOCK_OMAP is not set | 3324 | CONFIG_HWSPINLOCK_OMAP=m |
| 3321 | CONFIG_CLKSRC_MMIO=y | 3325 | CONFIG_CLKSRC_MMIO=y |