wl1271: remove sdio ARM dependency

Make it possible to use wl1271's SDIO interface on non-ARM platforms.

Fully tested on a x86 platform, compile-tested on ARM.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 337fc7bec5a5056ee9bbb73ba6ff16417d704b75..15163417f71fb00f03f9b8b2550abd0379842d39 100644 (file)
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -65,7 +65,7 @@ config WL1271_SPI
 
 config WL1271_SDIO
        tristate "TI wl1271 SDIO support"
-       depends on WL1271 && MMC && ARM
+       depends on WL1271 && MMC
        ---help---
          This module adds support for the SDIO interface of adapters using
          TI wl1271 chipset.  Select this if your platform is using

diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index d3d6f302f7058854178ca87dfa0713d8a4004e67..7059b5cccf0f8fff9651017607e4d18b75d78b30 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -28,7 +28,7 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/card.h>
-#include <plat/gpio.h>
+#include <linux/gpio.h>
 
 #include "wl1271.h"
 #include "wl12xx_80211.h"