[kernel] r19629 - dists/trunk/linux/debian/config

[Ben Hutchings]

Author: benh
Date: Sat Dec 22 04:20:41 2012
New Revision: 19629

Log:
Fix up config for renaming in 3.7 and earlier

Modified:
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sat Dec 22 04:16:05 2012	(r19628)
+++ dists/trunk/linux/debian/config/config	Sat Dec 22 04:20:41 2012	(r19629)
@@ -2467,6 +2467,12 @@
 CONFIG_WL12XX=m
 
 ##
+## file: drivers/net/wireless/ti/wlcore/Kconfig
+##
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLCORE_SPI=m
+
+##
 ## file: drivers/net/wireless/zd1211rw/Kconfig
 ##
 CONFIG_ZD1211RW=m
@@ -4394,6 +4400,7 @@
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
@@ -4952,8 +4959,5 @@
 ##
 ## file: unknown
 ##
-CONFIG_IPV6_GRE=m
 CONFIG_LEDS_ALIX2=m
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SPI=m