diff --git a/config-armv7 b/config-armv7
index f188fdc..1ce1fac 100644
--- a/config-armv7
+++ b/config-armv7
@@ -108,9 +108,6 @@ CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_INPUT_PALMAS_PWRBUTTON=m
 CONFIG_PALMAS_GPADC=m
 
-CONFIG_WL_TI=y
-CONFIG_WL18XX=m
-CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_NFC_WILINK=m
 
@@ -376,7 +373,6 @@ CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_FSL_USB2=m
 CONFIG_NET_VENDOR_FREESCALE=y
 # CONFIG_GIANFAR is not set
diff --git a/config-generic b/config-generic
index cb69268..34f0b4e 100644
--- a/config-generic
+++ b/config-generic
@@ -1940,16 +1940,15 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 
 CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLCORE_SPI=m
 CONFIG_WL12XX=m
-
 CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL1251_SPI=m
 CONFIG_WL18XX=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WILINK_PLATFORM_DATA=y
-
 
 CONFIG_RTL_CARDS=m
 CONFIG_WLAN_VENDOR_REALTEK=y