From 0b7aedc13137e45bc86768806f265ffeaa7797f0 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 1 Sep 2013 03:16:27 +0000
Subject: [PATCH] wireless/ti: Disable WL_TI on all configurations except
 armhf/armmp

These devices need platform data (even for SDIO) and apparently are
only used with ARM boards at the moment.

svn path=/dists/trunk/linux/; revision=20543
---
 debian/changelog                 |  1 +
 debian/config/armhf/config.armmp | 18 ++++++++++++++++++
 debian/config/config             | 25 +------------------------
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb6a329ec..678d2c662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ linux (3.11~rc7-1~exp1) UNRELEASED; urgency=low
     COMEDI_NI_LABPC) as modules
   * [amd64] iommu: Enable AMD_IOMMU_V2
   * [x86,ia64] fs: Enable EFIVAR_FS as module
+  * wireless/ti: Disable WL_TI on all configurations except armhf/armmp
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 11 Aug 2013 19:34:47 +0200
 
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 9bde54017..a9e77e64c 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -368,17 +368,35 @@ CONFIG_TI_CPSW=m
 ##
 CONFIG_MDIO_SUN4I=y
 
+##
+## file: drivers/net/wireless/ti/Kconfig
+##
+CONFIG_WL_TI=m
+CONFIG_WILINK_PLATFORM_DATA=y
+
 ##
 ## file: drivers/net/wireless/ti/wl1251/Kconfig
 ##
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
 
 ##
 ## file: drivers/net/wireless/ti/wl12xx/Kconfig
 ##
 CONFIG_WL12XX=m
 
+##
+## file: drivers/net/wireless/ti/wl18xx/Kconfig
+##
+CONFIG_WL18XX=m
+
+##
+## file: drivers/net/wireless/ti/wlcore/Kconfig
+##
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+
 ##
 ## file: drivers/power/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index c5a1fe22d..e1a838f8a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2802,30 +2802,7 @@ CONFIG_RTL8192CU=m
 ##
 ## file: drivers/net/wireless/ti/Kconfig
 ##
-CONFIG_WL_TI=y
-
-##
-## file: drivers/net/wireless/ti/wl1251/Kconfig
-##
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-
-##
-## file: drivers/net/wireless/ti/wl12xx/Kconfig
-##
-CONFIG_WL12XX=m
-
-##
-## file: drivers/net/wireless/ti/wl18xx/Kconfig
-##
-CONFIG_WL18XX=m
-
-##
-## file: drivers/net/wireless/ti/wlcore/Kconfig
-##
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
+# CONFIG_WL_TI is not set
 
 ##
 ## file: drivers/net/wireless/zd1211rw/Kconfig