diff options
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r-- | drivers/net/wireless/ti/Kconfig | 9 | ||||
-rw-r--r-- | drivers/net/wireless/ti/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ti/wilink_platform_data.c (renamed from drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/ti/wlcore/Kconfig | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ti/wlcore/Makefile | 3 |
5 files changed, 12 insertions, 9 deletions
diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig index be800119d0a3..cbe1e7fef61b 100644 --- a/drivers/net/wireless/ti/Kconfig +++ b/drivers/net/wireless/ti/Kconfig | |||
@@ -12,4 +12,13 @@ source "drivers/net/wireless/ti/wl18xx/Kconfig" | |||
12 | 12 | ||
13 | # keep last for automatic dependencies | 13 | # keep last for automatic dependencies |
14 | source "drivers/net/wireless/ti/wlcore/Kconfig" | 14 | source "drivers/net/wireless/ti/wlcore/Kconfig" |
15 | |||
16 | config WILINK_PLATFORM_DATA | ||
17 | bool "TI WiLink platform data" | ||
18 | depends on WLCORE_SDIO || WL1251_SDIO | ||
19 | default y | ||
20 | ---help--- | ||
21 | Small platform data bit needed to pass data to the sdio modules. | ||
22 | |||
23 | |||
15 | endif # WL_TI | 24 | endif # WL_TI |
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile index 4d6823983c04..af14231aeede 100644 --- a/drivers/net/wireless/ti/Makefile +++ b/drivers/net/wireless/ti/Makefile | |||
@@ -1,5 +1,7 @@ | |||
1 | obj-$(CONFIG_WLCORE) += wlcore/ | 1 | obj-$(CONFIG_WLCORE) += wlcore/ |
2 | obj-$(CONFIG_WL12XX) += wl12xx/ | 2 | obj-$(CONFIG_WL12XX) += wl12xx/ |
3 | obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wlcore/ | ||
4 | obj-$(CONFIG_WL1251) += wl1251/ | 3 | obj-$(CONFIG_WL1251) += wl1251/ |
5 | obj-$(CONFIG_WL18XX) += wl18xx/ | 4 | obj-$(CONFIG_WL18XX) += wl18xx/ |
5 | |||
6 | # small builtin driver bit | ||
7 | obj-$(CONFIG_WILINK_PLATFORM_DATA) += wilink_platform_data.o | ||
diff --git a/drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c b/drivers/net/wireless/ti/wilink_platform_data.c index 998e95895f9d..998e95895f9d 100644 --- a/drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c +++ b/drivers/net/wireless/ti/wilink_platform_data.c | |||
diff --git a/drivers/net/wireless/ti/wlcore/Kconfig b/drivers/net/wireless/ti/wlcore/Kconfig index d7b907e67170..2b832825c3d4 100644 --- a/drivers/net/wireless/ti/wlcore/Kconfig +++ b/drivers/net/wireless/ti/wlcore/Kconfig | |||
@@ -33,8 +33,3 @@ config WLCORE_SDIO | |||
33 | 33 | ||
34 | If you choose to build a module, it'll be called wlcore_sdio. | 34 | If you choose to build a module, it'll be called wlcore_sdio. |
35 | Say N if unsure. | 35 | Say N if unsure. |
36 | |||
37 | config WL12XX_PLATFORM_DATA | ||
38 | bool | ||
39 | depends on WLCORE_SDIO != n || WL1251_SDIO != n | ||
40 | default y | ||
diff --git a/drivers/net/wireless/ti/wlcore/Makefile b/drivers/net/wireless/ti/wlcore/Makefile index d9fba9e32130..b21398f6c3ec 100644 --- a/drivers/net/wireless/ti/wlcore/Makefile +++ b/drivers/net/wireless/ti/wlcore/Makefile | |||
@@ -9,7 +9,4 @@ obj-$(CONFIG_WLCORE) += wlcore.o | |||
9 | obj-$(CONFIG_WLCORE_SPI) += wlcore_spi.o | 9 | obj-$(CONFIG_WLCORE_SPI) += wlcore_spi.o |
10 | obj-$(CONFIG_WLCORE_SDIO) += wlcore_sdio.o | 10 | obj-$(CONFIG_WLCORE_SDIO) += wlcore_sdio.o |
11 | 11 | ||
12 | # small builtin driver bit | ||
13 | obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o | ||
14 | |||
15 | ccflags-y += -D__CHECK_ENDIAN__ | 12 | ccflags-y += -D__CHECK_ENDIAN__ |