38 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig
index 75722d81188c..1e8d04b56c9a 100644
--- a/drivers/net/wireless/ti/Kconfig
+++ b/drivers/net/wireless/ti/Kconfig
@@ -7,5 +7,5 @@ menuconfig WL_TI
 
 if WL_TI
 source "drivers/net/wireless/ti/wl1251/Kconfig"
-source "drivers/net/wireless/ti/wl12xx/Kconfig"
+source "drivers/net/wireless/ti/wlcore/Kconfig"
 endif # WL_TI
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile
index db2cb03f6f98..10919dbd875d 100644
--- a/drivers/net/wireless/ti/Makefile
+++ b/drivers/net/wireless/ti/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_WL12XX)			+= wl12xx/
-obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/
+obj-$(CONFIG_WL12XX)			+= wlcore/
+obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wlcore/
 obj-$(CONFIG_WL1251)			+= wl1251/
diff --git a/drivers/net/wireless/ti/wl12xx/Kconfig b/drivers/net/wireless/ti/wlcore/Kconfig
index af08c8609c63..af08c8609c63 100644
--- a/drivers/net/wireless/ti/wl12xx/Kconfig
+++ b/drivers/net/wireless/ti/wlcore/Kconfig
diff --git a/drivers/net/wireless/ti/wl12xx/Makefile b/drivers/net/wireless/ti/wlcore/Makefile
index 98f289c907a9..98f289c907a9 100644
--- a/drivers/net/wireless/ti/wl12xx/Makefile
+++ b/drivers/net/wireless/ti/wlcore/Makefile
diff --git a/drivers/net/wireless/ti/wl12xx/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index bc96db0683a5..bc96db0683a5 100644
--- a/drivers/net/wireless/ti/wl12xx/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
diff --git a/drivers/net/wireless/ti/wl12xx/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index a28fc044034c..a28fc044034c 100644
--- a/drivers/net/wireless/ti/wl12xx/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
diff --git a/drivers/net/wireless/ti/wl12xx/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index 88d60c40b7e3..88d60c40b7e3 100644
--- a/drivers/net/wireless/ti/wl12xx/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
diff --git a/drivers/net/wireless/ti/wl12xx/boot.h b/drivers/net/wireless/ti/wlcore/boot.h
index c3adc09f403d..c3adc09f403d 100644
--- a/drivers/net/wireless/ti/wl12xx/boot.h
+++ b/drivers/net/wireless/ti/wlcore/boot.h
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 82cb90a4a99c..82cb90a4a99c 100644
--- a/drivers/net/wireless/ti/wl12xx/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
index de217d92516b..de217d92516b 100644
--- a/drivers/net/wireless/ti/wl12xx/cmd.h
+++ b/drivers/net/wireless/ti/wlcore/cmd.h
diff --git a/drivers/net/wireless/ti/wl12xx/conf.h b/drivers/net/wireless/ti/wlcore/conf.h
index 5d2a9e004c72..5d2a9e004c72 100644
--- a/drivers/net/wireless/ti/wl12xx/conf.h
+++ b/drivers/net/wireless/ti/wlcore/conf.h
diff --git a/drivers/net/wireless/ti/wl12xx/debug.h b/drivers/net/wireless/ti/wlcore/debug.h
index ec0fdc25b280..ec0fdc25b280 100644
--- a/drivers/net/wireless/ti/wl12xx/debug.h
+++ b/drivers/net/wireless/ti/wlcore/debug.h
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
index e1cf72765965..e1cf72765965 100644
--- a/drivers/net/wireless/ti/wl12xx/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.h b/drivers/net/wireless/ti/wlcore/debugfs.h
index 254c5b292cf6..254c5b292cf6 100644
--- a/drivers/net/wireless/ti/wl12xx/debugfs.h
+++ b/drivers/net/wireless/ti/wlcore/debugfs.h
diff --git a/drivers/net/wireless/ti/wl12xx/event.c b/drivers/net/wireless/ti/wlcore/event.c
index 96f06a89c2a9..96f06a89c2a9 100644
--- a/drivers/net/wireless/ti/wl12xx/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
diff --git a/drivers/net/wireless/ti/wl12xx/event.h b/drivers/net/wireless/ti/wlcore/event.h
index 8acba0d43976..8acba0d43976 100644
--- a/drivers/net/wireless/ti/wl12xx/event.h
+++ b/drivers/net/wireless/ti/wlcore/event.h
diff --git a/drivers/net/wireless/ti/wl12xx/ini.h b/drivers/net/wireless/ti/wlcore/ini.h
index 4cf9ecc56212..4cf9ecc56212 100644
--- a/drivers/net/wireless/ti/wl12xx/ini.h
+++ b/drivers/net/wireless/ti/wlcore/ini.h
diff --git a/drivers/net/wireless/ti/wl12xx/init.c b/drivers/net/wireless/ti/wlcore/init.c
index 203fbebf09eb..203fbebf09eb 100644
--- a/drivers/net/wireless/ti/wl12xx/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
diff --git a/drivers/net/wireless/ti/wl12xx/init.h b/drivers/net/wireless/ti/wlcore/init.h
index 2da0f404ef6e..2da0f404ef6e 100644
--- a/drivers/net/wireless/ti/wl12xx/init.h
+++ b/drivers/net/wireless/ti/wlcore/init.h
diff --git a/drivers/net/wireless/ti/wl12xx/io.c b/drivers/net/wireless/ti/wlcore/io.c
index c574a3b31e31..c574a3b31e31 100644
--- a/drivers/net/wireless/ti/wl12xx/io.c
+++ b/drivers/net/wireless/ti/wlcore/io.c
diff --git a/drivers/net/wireless/ti/wl12xx/io.h b/drivers/net/wireless/ti/wlcore/io.h
index 4fb3dab8c3b2..4fb3dab8c3b2 100644
--- a/drivers/net/wireless/ti/wl12xx/io.h
+++ b/drivers/net/wireless/ti/wlcore/io.h
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 96ca25a92b76..96ca25a92b76 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
diff --git a/drivers/net/wireless/ti/wl12xx/ps.c b/drivers/net/wireless/ti/wlcore/ps.c
index 78f598b4f97b..78f598b4f97b 100644
--- a/drivers/net/wireless/ti/wl12xx/ps.c
+++ b/drivers/net/wireless/ti/wlcore/ps.c
diff --git a/drivers/net/wireless/ti/wl12xx/ps.h b/drivers/net/wireless/ti/wlcore/ps.h
index 5f19d4fbbf27..5f19d4fbbf27 100644
--- a/drivers/net/wireless/ti/wl12xx/ps.h
+++ b/drivers/net/wireless/ti/wlcore/ps.h
diff --git a/drivers/net/wireless/ti/wl12xx/reg.h b/drivers/net/wireless/ti/wlcore/reg.h
index 340db324bc26..340db324bc26 100644
--- a/drivers/net/wireless/ti/wl12xx/reg.h
+++ b/drivers/net/wireless/ti/wlcore/reg.h
diff --git a/drivers/net/wireless/ti/wl12xx/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index cfa6071704c5..cfa6071704c5 100644
--- a/drivers/net/wireless/ti/wl12xx/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
diff --git a/drivers/net/wireless/ti/wl12xx/rx.h b/drivers/net/wireless/ti/wlcore/rx.h
index 86ba6b1d0cdc..86ba6b1d0cdc 100644
--- a/drivers/net/wireless/ti/wl12xx/rx.h
+++ b/drivers/net/wireless/ti/wlcore/rx.h
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index a57f333d07f5..a57f333d07f5 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
diff --git a/drivers/net/wireless/ti/wl12xx/scan.h b/drivers/net/wireless/ti/wlcore/scan.h
index 2b300f4d0be9..2b300f4d0be9 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.h
+++ b/drivers/net/wireless/ti/wlcore/scan.h
diff --git a/drivers/net/wireless/ti/wl12xx/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 4b3c32774bae..4b3c32774bae 100644
--- a/drivers/net/wireless/ti/wl12xx/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
diff --git a/drivers/net/wireless/ti/wl12xx/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index 2fc18a8dcce8..2fc18a8dcce8 100644
--- a/drivers/net/wireless/ti/wl12xx/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
diff --git a/drivers/net/wireless/ti/wl12xx/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c
index 1e93bb9c0246..1e93bb9c0246 100644
--- a/drivers/net/wireless/ti/wl12xx/testmode.c
+++ b/drivers/net/wireless/ti/wlcore/testmode.c
diff --git a/drivers/net/wireless/ti/wl12xx/testmode.h b/drivers/net/wireless/ti/wlcore/testmode.h
index 8071654259ea..8071654259ea 100644
--- a/drivers/net/wireless/ti/wl12xx/testmode.h
+++ b/drivers/net/wireless/ti/wlcore/testmode.h
diff --git a/drivers/net/wireless/ti/wl12xx/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 43ae49143d68..43ae49143d68 100644
--- a/drivers/net/wireless/ti/wl12xx/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
diff --git a/drivers/net/wireless/ti/wl12xx/tx.h b/drivers/net/wireless/ti/wlcore/tx.h
index 5cf8c32d40d1..5cf8c32d40d1 100644
--- a/drivers/net/wireless/ti/wl12xx/tx.h
+++ b/drivers/net/wireless/ti/wlcore/tx.h
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wlcore/wl12xx.h
index 82802d1c0782..82802d1c0782 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/ti/wlcore/wl12xx.h
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx_80211.h b/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
index 22b0bc98d7b5..22b0bc98d7b5 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx_platform_data.c b/drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c
index 998e95895f9d..998e95895f9d 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx_platform_data.c
+++ b/drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c