diff options
| -rw-r--r-- | MAINTAINERS | 27 | ||||
| -rw-r--r-- | drivers/net/wireless/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/Makefile | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/Kconfig (renamed from drivers/net/wireless/wl1251/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/Makefile (renamed from drivers/net/wireless/wl1251/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/acx.c (renamed from drivers/net/wireless/wl1251/acx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/acx.h (renamed from drivers/net/wireless/wl1251/acx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/boot.c (renamed from drivers/net/wireless/wl1251/boot.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/boot.h (renamed from drivers/net/wireless/wl1251/boot.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/cmd.c (renamed from drivers/net/wireless/wl1251/cmd.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/cmd.h (renamed from drivers/net/wireless/wl1251/cmd.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/debugfs.c (renamed from drivers/net/wireless/wl1251/debugfs.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/debugfs.h (renamed from drivers/net/wireless/wl1251/debugfs.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/event.c (renamed from drivers/net/wireless/wl1251/event.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/event.h (renamed from drivers/net/wireless/wl1251/event.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/init.c (renamed from drivers/net/wireless/wl1251/init.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/init.h (renamed from drivers/net/wireless/wl1251/init.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/io.c (renamed from drivers/net/wireless/wl1251/io.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/io.h (renamed from drivers/net/wireless/wl1251/io.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/main.c (renamed from drivers/net/wireless/wl1251/main.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/ps.c (renamed from drivers/net/wireless/wl1251/ps.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/ps.h (renamed from drivers/net/wireless/wl1251/ps.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/reg.h (renamed from drivers/net/wireless/wl1251/reg.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/rx.c (renamed from drivers/net/wireless/wl1251/rx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/rx.h (renamed from drivers/net/wireless/wl1251/rx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/sdio.c (renamed from drivers/net/wireless/wl1251/sdio.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/spi.c (renamed from drivers/net/wireless/wl1251/spi.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/spi.h (renamed from drivers/net/wireless/wl1251/spi.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/tx.c (renamed from drivers/net/wireless/wl1251/tx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/tx.h (renamed from drivers/net/wireless/wl1251/tx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/wl1251.h (renamed from drivers/net/wireless/wl1251/wl1251.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/wl12xx_80211.h (renamed from drivers/net/wireless/wl1251/wl12xx_80211.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/Kconfig (renamed from drivers/net/wireless/wl12xx/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/Makefile (renamed from drivers/net/wireless/wl12xx/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/acx.c (renamed from drivers/net/wireless/wl12xx/acx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/acx.h (renamed from drivers/net/wireless/wl12xx/acx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/boot.c (renamed from drivers/net/wireless/wl12xx/boot.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/boot.h (renamed from drivers/net/wireless/wl12xx/boot.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/cmd.c (renamed from drivers/net/wireless/wl12xx/cmd.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/cmd.h (renamed from drivers/net/wireless/wl12xx/cmd.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/conf.h (renamed from drivers/net/wireless/wl12xx/conf.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/debug.h (renamed from drivers/net/wireless/wl12xx/debug.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/debugfs.c (renamed from drivers/net/wireless/wl12xx/debugfs.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/debugfs.h (renamed from drivers/net/wireless/wl12xx/debugfs.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/event.c (renamed from drivers/net/wireless/wl12xx/event.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/event.h (renamed from drivers/net/wireless/wl12xx/event.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/ini.h (renamed from drivers/net/wireless/wl12xx/ini.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/init.c (renamed from drivers/net/wireless/wl12xx/init.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/init.h (renamed from drivers/net/wireless/wl12xx/init.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/io.c (renamed from drivers/net/wireless/wl12xx/io.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/io.h (renamed from drivers/net/wireless/wl12xx/io.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/main.c (renamed from drivers/net/wireless/wl12xx/main.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/ps.c (renamed from drivers/net/wireless/wl12xx/ps.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/ps.h (renamed from drivers/net/wireless/wl12xx/ps.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/reg.h (renamed from drivers/net/wireless/wl12xx/reg.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/rx.c (renamed from drivers/net/wireless/wl12xx/rx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/rx.h (renamed from drivers/net/wireless/wl12xx/rx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/scan.c (renamed from drivers/net/wireless/wl12xx/scan.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/scan.h (renamed from drivers/net/wireless/wl12xx/scan.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/sdio.c (renamed from drivers/net/wireless/wl12xx/sdio.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/spi.c (renamed from drivers/net/wireless/wl12xx/spi.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/testmode.c (renamed from drivers/net/wireless/wl12xx/testmode.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/testmode.h (renamed from drivers/net/wireless/wl12xx/testmode.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/tx.c (renamed from drivers/net/wireless/wl12xx/tx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/tx.h (renamed from drivers/net/wireless/wl12xx/tx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/wl12xx.h (renamed from drivers/net/wireless/wl12xx/wl12xx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/wl12xx_80211.h (renamed from drivers/net/wireless/wl12xx/wl12xx_80211.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/wl12xx_platform_data.c (renamed from drivers/net/wireless/wl12xx/wl12xx_platform_data.c) | 0 |
70 files changed, 26 insertions, 22 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3adbbb294bad..073a7b8df560 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6660,6 +6660,16 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Maintained F: sound/soc/codecs/twl4030* +TI WILINK WIRELESS DRIVERS +M: Luciano Coelho <coelho@ti.com> +L: linux-wireless@vger.kernel.org +W: http://wireless.kernel.org/en/users/Drivers/wl12xx +W: http://wireless.kernel.org/en/users/Drivers/wl1251 +T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git +S: Maintained +F: drivers/net/wireless/ti/ +F: include/linux/wl12xx.h + TIPC NETWORK LAYER M: Jon Maloy <jon.maloy@ericsson.com> M: Allan Stephens <allan.stephens@windriver.com> @@ -7416,23 +7426,6 @@ M: Miloslav Trmac <mitr@volny.cz> S: Maintained F: drivers/input/misc/wistron_btns.c -WL1251 WIRELESS DRIVER -M: Luciano Coelho <coelho@ti.com> -L: linux-wireless@vger.kernel.org -W: http://wireless.kernel.org/en/users/Drivers/wl1251 -T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git -S: Maintained -F: drivers/net/wireless/wl1251/* - -WL1271 WIRELESS DRIVER -M: Luciano Coelho <coelho@ti.com> -L: linux-wireless@vger.kernel.org -W: http://wireless.kernel.org/en/users/Drivers/wl12xx -T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git -S: Maintained -F: drivers/net/wireless/wl12xx/ -F: include/linux/wl12xx.h - WL3501 WIRELESS PCMCIA CARD DRIVER M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> L: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index abd3b71cd4ab..5f58fa53238c 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -282,8 +282,7 @@ source "drivers/net/wireless/orinoco/Kconfig" source "drivers/net/wireless/p54/Kconfig" source "drivers/net/wireless/rt2x00/Kconfig" source "drivers/net/wireless/rtlwifi/Kconfig" -source "drivers/net/wireless/wl1251/Kconfig" -source "drivers/net/wireless/wl12xx/Kconfig" +source "drivers/net/wireless/ti/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig" source "drivers/net/wireless/mwifiex/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 98db76196b59..0ce218b931d4 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -51,9 +51,7 @@ obj-$(CONFIG_ATH_COMMON) += ath/ obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o -obj-$(CONFIG_WL1251) += wl1251/ -obj-$(CONFIG_WL12XX) += wl12xx/ -obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/ +obj-$(CONFIG_WL_TI) += ti/ obj-$(CONFIG_IWM) += iwmc3200wifi/ diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig new file mode 100644 index 000000000000..75722d81188c --- /dev/null +++ b/drivers/net/wireless/ti/Kconfig @@ -0,0 +1,11 @@ +menuconfig WL_TI + bool "TI Wireless LAN support" + ---help--- + This section contains support for all the wireless drivers + for Texas Instruments WLAN chips, such as wl1251 and the wl12xx + family. + +if WL_TI +source "drivers/net/wireless/ti/wl1251/Kconfig" +source "drivers/net/wireless/ti/wl12xx/Kconfig" +endif # WL_TI diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile new file mode 100644 index 000000000000..db2cb03f6f98 --- /dev/null +++ b/drivers/net/wireless/ti/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_WL12XX) += wl12xx/ +obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/ +obj-$(CONFIG_WL1251) += wl1251/ diff --git a/drivers/net/wireless/wl1251/Kconfig b/drivers/net/wireless/ti/wl1251/Kconfig index 1fb65849414f..1fb65849414f 100644 --- a/drivers/net/wireless/wl1251/Kconfig +++ b/drivers/net/wireless/ti/wl1251/Kconfig diff --git a/drivers/net/wireless/wl1251/Makefile b/drivers/net/wireless/ti/wl1251/Makefile index a5c6328b5f72..a5c6328b5f72 100644 --- a/drivers/net/wireless/wl1251/Makefile +++ b/drivers/net/wireless/ti/wl1251/Makefile diff --git a/drivers/net/wireless/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c index ad87a1ac6462..ad87a1ac6462 100644 --- a/drivers/net/wireless/wl1251/acx.c +++ b/drivers/net/wireless/ti/wl1251/acx.c diff --git a/drivers/net/wireless/wl1251/acx.h b/drivers/net/wireless/ti/wl1251/acx.h index c2ba100f9b1a..c2ba100f9b1a 100644 --- a/drivers/net/wireless/wl1251/acx.h +++ b/drivers/net/wireless/ti/wl1251/acx.h diff --git a/drivers/net/wireless/wl1251/boot.c b/drivers/net/wireless/ti/wl1251/boot.c index a2e5241382da..a2e5241382da 100644 --- a/drivers/net/wireless/wl1251/boot.c +++ b/drivers/net/wireless/ti/wl1251/boot.c diff --git a/drivers/net/wireless/wl1251/boot.h b/drivers/net/wireless/ti/wl1251/boot.h index 7661bc5e4662..7661bc5e4662 100644 --- a/drivers/net/wireless/wl1251/boot.h +++ b/drivers/net/wireless/ti/wl1251/boot.h diff --git a/drivers/net/wireless/wl1251/cmd.c b/drivers/net/wireless/ti/wl1251/cmd.c index d14d69d733a0..d14d69d733a0 100644 --- a/drivers/net/wireless/wl1251/cmd.c +++ b/drivers/net/wireless/ti/wl1251/cmd.c diff --git a/drivers/net/wireless/wl1251/cmd.h b/drivers/net/wireless/ti/wl1251/cmd.h index ee4f2b391822..ee4f2b391822 100644 --- a/drivers/net/wireless/wl1251/cmd.h +++ b/drivers/net/wireless/ti/wl1251/cmd.h diff --git a/drivers/net/wireless/wl1251/debugfs.c b/drivers/net/wireless/ti/wl1251/debugfs.c index 6c274007d200..6c274007d200 100644 --- a/drivers/net/wireless/wl1251/debugfs.c +++ b/drivers/net/wireless/ti/wl1251/debugfs.c diff --git a/drivers/net/wireless/wl1251/debugfs.h b/drivers/net/wireless/ti/wl1251/debugfs.h index b3417c02a218..b3417c02a218 100644 --- a/drivers/net/wireless/wl1251/debugfs.h +++ b/drivers/net/wireless/ti/wl1251/debugfs.h diff --git a/drivers/net/wireless/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c index 9f15ccaf8f05..9f15ccaf8f05 100644 --- a/drivers/net/wireless/wl1251/event.c +++ b/drivers/net/wireless/ti/wl1251/event.c diff --git a/drivers/net/wireless/wl1251/event.h b/drivers/net/wireless/ti/wl1251/event.h index 30eb5d150bf7..30eb5d150bf7 100644 --- a/drivers/net/wireless/wl1251/event.h +++ b/drivers/net/wireless/ti/wl1251/event.h diff --git a/drivers/net/wireless/wl1251/init.c b/drivers/net/wireless/ti/wl1251/init.c index 89b43d35473c..89b43d35473c 100644 --- a/drivers/net/wireless/wl1251/init.c +++ b/drivers/net/wireless/ti/wl1251/init.c diff --git a/drivers/net/wireless/wl1251/init.h b/drivers/net/wireless/ti/wl1251/init.h index 543f17582ead..543f17582ead 100644 --- a/drivers/net/wireless/wl1251/init.h +++ b/drivers/net/wireless/ti/wl1251/init.h diff --git a/drivers/net/wireless/wl1251/io.c b/drivers/net/wireless/ti/wl1251/io.c index cdcadbf6ac2c..cdcadbf6ac2c 100644 --- a/drivers/net/wireless/wl1251/io.c +++ b/drivers/net/wireless/ti/wl1251/io.c diff --git a/drivers/net/wireless/wl1251/io.h b/drivers/net/wireless/ti/wl1251/io.h index d382877c34cc..d382877c34cc 100644 --- a/drivers/net/wireless/wl1251/io.h +++ b/drivers/net/wireless/ti/wl1251/io.h diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 41302c7b1ad0..41302c7b1ad0 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c diff --git a/drivers/net/wireless/wl1251/ps.c b/drivers/net/wireless/ti/wl1251/ps.c index db719f7d2692..db719f7d2692 100644 --- a/drivers/net/wireless/wl1251/ps.c +++ b/drivers/net/wireless/ti/wl1251/ps.c diff --git a/drivers/net/wireless/wl1251/ps.h b/drivers/net/wireless/ti/wl1251/ps.h index 75efad246d67..75efad246d67 100644 --- a/drivers/net/wireless/wl1251/ps.h +++ b/drivers/net/wireless/ti/wl1251/ps.h diff --git a/drivers/net/wireless/wl1251/reg.h b/drivers/net/wireless/ti/wl1251/reg.h index a5809019c5c1..a5809019c5c1 100644 --- a/drivers/net/wireless/wl1251/reg.h +++ b/drivers/net/wireless/ti/wl1251/reg.h diff --git a/drivers/net/wireless/wl1251/rx.c b/drivers/net/wireless/ti/wl1251/rx.c index 6af35265c900..6af35265c900 100644 --- a/drivers/net/wireless/wl1251/rx.c +++ b/drivers/net/wireless/ti/wl1251/rx.c diff --git a/drivers/net/wireless/wl1251/rx.h b/drivers/net/wireless/ti/wl1251/rx.h index 4448f635a4d8..4448f635a4d8 100644 --- a/drivers/net/wireless/wl1251/rx.h +++ b/drivers/net/wireless/ti/wl1251/rx.h diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c index f78694295c39..f78694295c39 100644 --- a/drivers/net/wireless/wl1251/sdio.c +++ b/drivers/net/wireless/ti/wl1251/sdio.c diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c index 6248c354fc5c..6248c354fc5c 100644 --- a/drivers/net/wireless/wl1251/spi.c +++ b/drivers/net/wireless/ti/wl1251/spi.c diff --git a/drivers/net/wireless/wl1251/spi.h b/drivers/net/wireless/ti/wl1251/spi.h index 16d506955cc0..16d506955cc0 100644 --- a/drivers/net/wireless/wl1251/spi.h +++ b/drivers/net/wireless/ti/wl1251/spi.h diff --git a/drivers/net/wireless/wl1251/tx.c b/drivers/net/wireless/ti/wl1251/tx.c index 28121c590a2b..28121c590a2b 100644 --- a/drivers/net/wireless/wl1251/tx.c +++ b/drivers/net/wireless/ti/wl1251/tx.c diff --git a/drivers/net/wireless/wl1251/tx.h b/drivers/net/wireless/ti/wl1251/tx.h index 81338d39b43e..81338d39b43e 100644 --- a/drivers/net/wireless/wl1251/tx.h +++ b/drivers/net/wireless/ti/wl1251/tx.h diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h index 9d8f5816c6f9..9d8f5816c6f9 100644 --- a/drivers/net/wireless/wl1251/wl1251.h +++ b/drivers/net/wireless/ti/wl1251/wl1251.h diff --git a/drivers/net/wireless/wl1251/wl12xx_80211.h b/drivers/net/wireless/ti/wl1251/wl12xx_80211.h index 04ed51495772..04ed51495772 100644 --- a/drivers/net/wireless/wl1251/wl12xx_80211.h +++ b/drivers/net/wireless/ti/wl1251/wl12xx_80211.h diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/ti/wl12xx/Kconfig index af08c8609c63..af08c8609c63 100644 --- a/drivers/net/wireless/wl12xx/Kconfig +++ b/drivers/net/wireless/ti/wl12xx/Kconfig diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/ti/wl12xx/Makefile index 98f289c907a9..98f289c907a9 100644 --- a/drivers/net/wireless/wl12xx/Makefile +++ b/drivers/net/wireless/ti/wl12xx/Makefile diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/ti/wl12xx/acx.c index bc96db0683a5..bc96db0683a5 100644 --- a/drivers/net/wireless/wl12xx/acx.c +++ b/drivers/net/wireless/ti/wl12xx/acx.c diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/ti/wl12xx/acx.h index a28fc044034c..a28fc044034c 100644 --- a/drivers/net/wireless/wl12xx/acx.h +++ b/drivers/net/wireless/ti/wl12xx/acx.h diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/ti/wl12xx/boot.c index 88d60c40b7e3..88d60c40b7e3 100644 --- a/drivers/net/wireless/wl12xx/boot.c +++ b/drivers/net/wireless/ti/wl12xx/boot.c diff --git a/drivers/net/wireless/wl12xx/boot.h b/drivers/net/wireless/ti/wl12xx/boot.h index c3adc09f403d..c3adc09f403d 100644 --- a/drivers/net/wireless/wl12xx/boot.h +++ b/drivers/net/wireless/ti/wl12xx/boot.h diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/ti/wl12xx/cmd.c index 82cb90a4a99c..82cb90a4a99c 100644 --- a/drivers/net/wireless/wl12xx/cmd.c +++ b/drivers/net/wireless/ti/wl12xx/cmd.c diff --git a/drivers/net/wireless/wl12xx/cmd.h b/drivers/net/wireless/ti/wl12xx/cmd.h index de217d92516b..de217d92516b 100644 --- a/drivers/net/wireless/wl12xx/cmd.h +++ b/drivers/net/wireless/ti/wl12xx/cmd.h diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/ti/wl12xx/conf.h index 5d2a9e004c72..5d2a9e004c72 100644 --- a/drivers/net/wireless/wl12xx/conf.h +++ b/drivers/net/wireless/ti/wl12xx/conf.h diff --git a/drivers/net/wireless/wl12xx/debug.h b/drivers/net/wireless/ti/wl12xx/debug.h index ec0fdc25b280..ec0fdc25b280 100644 --- a/drivers/net/wireless/wl12xx/debug.h +++ b/drivers/net/wireless/ti/wl12xx/debug.h diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/ti/wl12xx/debugfs.c index e1cf72765965..e1cf72765965 100644 --- a/drivers/net/wireless/wl12xx/debugfs.c +++ b/drivers/net/wireless/ti/wl12xx/debugfs.c diff --git a/drivers/net/wireless/wl12xx/debugfs.h b/drivers/net/wireless/ti/wl12xx/debugfs.h index 254c5b292cf6..254c5b292cf6 100644 --- a/drivers/net/wireless/wl12xx/debugfs.h +++ b/drivers/net/wireless/ti/wl12xx/debugfs.h diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/ti/wl12xx/event.c index 96f06a89c2a9..96f06a89c2a9 100644 --- a/drivers/net/wireless/wl12xx/event.c +++ b/drivers/net/wireless/ti/wl12xx/event.c diff --git a/drivers/net/wireless/wl12xx/event.h b/drivers/net/wireless/ti/wl12xx/event.h index 8acba0d43976..8acba0d43976 100644 --- a/drivers/net/wireless/wl12xx/event.h +++ b/drivers/net/wireless/ti/wl12xx/event.h diff --git a/drivers/net/wireless/wl12xx/ini.h b/drivers/net/wireless/ti/wl12xx/ini.h index 4cf9ecc56212..4cf9ecc56212 100644 --- a/drivers/net/wireless/wl12xx/ini.h +++ b/drivers/net/wireless/ti/wl12xx/ini.h diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/ti/wl12xx/init.c index 203fbebf09eb..203fbebf09eb 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/ti/wl12xx/init.c diff --git a/drivers/net/wireless/wl12xx/init.h b/drivers/net/wireless/ti/wl12xx/init.h index 2da0f404ef6e..2da0f404ef6e 100644 --- a/drivers/net/wireless/wl12xx/init.h +++ b/drivers/net/wireless/ti/wl12xx/init.h diff --git a/drivers/net/wireless/wl12xx/io.c b/drivers/net/wireless/ti/wl12xx/io.c index c574a3b31e31..c574a3b31e31 100644 --- a/drivers/net/wireless/wl12xx/io.c +++ b/drivers/net/wireless/ti/wl12xx/io.c diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/ti/wl12xx/io.h index 4fb3dab8c3b2..4fb3dab8c3b2 100644 --- a/drivers/net/wireless/wl12xx/io.h +++ b/drivers/net/wireless/ti/wl12xx/io.h diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c index 96ca25a92b76..96ca25a92b76 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/ti/wl12xx/main.c diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/ti/wl12xx/ps.c index 78f598b4f97b..78f598b4f97b 100644 --- a/drivers/net/wireless/wl12xx/ps.c +++ b/drivers/net/wireless/ti/wl12xx/ps.c diff --git a/drivers/net/wireless/wl12xx/ps.h b/drivers/net/wireless/ti/wl12xx/ps.h index 5f19d4fbbf27..5f19d4fbbf27 100644 --- a/drivers/net/wireless/wl12xx/ps.h +++ b/drivers/net/wireless/ti/wl12xx/ps.h diff --git a/drivers/net/wireless/wl12xx/reg.h b/drivers/net/wireless/ti/wl12xx/reg.h index 340db324bc26..340db324bc26 100644 --- a/drivers/net/wireless/wl12xx/reg.h +++ b/drivers/net/wireless/ti/wl12xx/reg.h diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/ti/wl12xx/rx.c index cfa6071704c5..cfa6071704c5 100644 --- a/drivers/net/wireless/wl12xx/rx.c +++ b/drivers/net/wireless/ti/wl12xx/rx.c diff --git a/drivers/net/wireless/wl12xx/rx.h b/drivers/net/wireless/ti/wl12xx/rx.h index 86ba6b1d0cdc..86ba6b1d0cdc 100644 --- a/drivers/net/wireless/wl12xx/rx.h +++ b/drivers/net/wireless/ti/wl12xx/rx.h diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/ti/wl12xx/scan.c index a57f333d07f5..a57f333d07f5 100644 --- a/drivers/net/wireless/wl12xx/scan.c +++ b/drivers/net/wireless/ti/wl12xx/scan.c diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/ti/wl12xx/scan.h index 2b300f4d0be9..2b300f4d0be9 100644 --- a/drivers/net/wireless/wl12xx/scan.h +++ b/drivers/net/wireless/ti/wl12xx/scan.h diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/ti/wl12xx/sdio.c index 4b3c32774bae..4b3c32774bae 100644 --- a/drivers/net/wireless/wl12xx/sdio.c +++ b/drivers/net/wireless/ti/wl12xx/sdio.c diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/ti/wl12xx/spi.c index 2fc18a8dcce8..2fc18a8dcce8 100644 --- a/drivers/net/wireless/wl12xx/spi.c +++ b/drivers/net/wireless/ti/wl12xx/spi.c diff --git a/drivers/net/wireless/wl12xx/testmode.c b/drivers/net/wireless/ti/wl12xx/testmode.c index 1e93bb9c0246..1e93bb9c0246 100644 --- a/drivers/net/wireless/wl12xx/testmode.c +++ b/drivers/net/wireless/ti/wl12xx/testmode.c diff --git a/drivers/net/wireless/wl12xx/testmode.h b/drivers/net/wireless/ti/wl12xx/testmode.h index 8071654259ea..8071654259ea 100644 --- a/drivers/net/wireless/wl12xx/testmode.h +++ b/drivers/net/wireless/ti/wl12xx/testmode.h diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/ti/wl12xx/tx.c index 43ae49143d68..43ae49143d68 100644 --- a/drivers/net/wireless/wl12xx/tx.c +++ b/drivers/net/wireless/ti/wl12xx/tx.c diff --git a/drivers/net/wireless/wl12xx/tx.h b/drivers/net/wireless/ti/wl12xx/tx.h index 5cf8c32d40d1..5cf8c32d40d1 100644 --- a/drivers/net/wireless/wl12xx/tx.h +++ b/drivers/net/wireless/ti/wl12xx/tx.h diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h index 82802d1c0782..82802d1c0782 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/ti/wl12xx/wl12xx_80211.h index 22b0bc98d7b5..22b0bc98d7b5 100644 --- a/drivers/net/wireless/wl12xx/wl12xx_80211.h +++ b/drivers/net/wireless/ti/wl12xx/wl12xx_80211.h diff --git a/drivers/net/wireless/wl12xx/wl12xx_platform_data.c b/drivers/net/wireless/ti/wl12xx/wl12xx_platform_data.c index 998e95895f9d..998e95895f9d 100644 --- a/drivers/net/wireless/wl12xx/wl12xx_platform_data.c +++ b/drivers/net/wireless/ti/wl12xx/wl12xx_platform_data.c |