@@ -7956,7 +7956,7 @@ M: Christian Lamparter <chunkeey@googlemail.com>
L: linux-wireless@vger.kernel.org
W: http://wireless.kernel.org/en/users/Drivers/p54
S: Maintained
-F: drivers/net/wireless/p54/
+F: drivers/net/wireless/intersil/p54/
PA SEMI ETHERNET DRIVER
M: Olof Johansson <olof@lixom.net>
@@ -118,7 +118,6 @@ config MAC80211_HWSIM
source "drivers/net/wireless/ath/Kconfig"
source "drivers/net/wireless/orinoco/Kconfig"
-source "drivers/net/wireless/p54/Kconfig"
source "drivers/net/wireless/rt2x00/Kconfig"
source "drivers/net/wireless/mediatek/Kconfig"
source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
@@ -28,8 +28,6 @@ obj-$(CONFIG_RT2X00) += rt2x00/
obj-$(CONFIG_WL_MEDIATEK) += mediatek/
-obj-$(CONFIG_P54_COMMON) += p54/
-
obj-$(CONFIG_ATH_CARDS) += ath/
obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o
@@ -12,5 +12,6 @@ config WLAN_VENDOR_INTERSIL
if WLAN_VENDOR_INTERSIL
source "drivers/net/wireless/intersil/hostap/Kconfig"
+source "drivers/net/wireless/intersil/p54/Kconfig"
endif # WLAN_VENDOR_INTERSIL
@@ -1 +1,2 @@
obj-$(CONFIG_HOSTAP) += hostap/
+obj-$(CONFIG_P54_COMMON) += p54/
similarity index 100%
rename from drivers/net/wireless/p54/Kconfig
rename to drivers/net/wireless/intersil/p54/Kconfig
similarity index 100%
rename from drivers/net/wireless/p54/Makefile
rename to drivers/net/wireless/intersil/p54/Makefile
similarity index 100%
rename from drivers/net/wireless/p54/eeprom.c
rename to drivers/net/wireless/intersil/p54/eeprom.c
similarity index 100%
rename from drivers/net/wireless/p54/eeprom.h
rename to drivers/net/wireless/intersil/p54/eeprom.h
similarity index 100%
rename from drivers/net/wireless/p54/fwio.c
rename to drivers/net/wireless/intersil/p54/fwio.c
similarity index 100%
rename from drivers/net/wireless/p54/led.c
rename to drivers/net/wireless/intersil/p54/led.c
similarity index 100%
rename from drivers/net/wireless/p54/lmac.h
rename to drivers/net/wireless/intersil/p54/lmac.h
similarity index 100%
rename from drivers/net/wireless/p54/main.c
rename to drivers/net/wireless/intersil/p54/main.c
similarity index 100%
rename from drivers/net/wireless/p54/p54.h
rename to drivers/net/wireless/intersil/p54/p54.h
similarity index 100%
rename from drivers/net/wireless/p54/p54pci.c
rename to drivers/net/wireless/intersil/p54/p54pci.c
similarity index 100%
rename from drivers/net/wireless/p54/p54pci.h
rename to drivers/net/wireless/intersil/p54/p54pci.h
similarity index 100%
rename from drivers/net/wireless/p54/p54spi.c
rename to drivers/net/wireless/intersil/p54/p54spi.c
similarity index 100%
rename from drivers/net/wireless/p54/p54spi.h
rename to drivers/net/wireless/intersil/p54/p54spi.h
similarity index 100%
rename from drivers/net/wireless/p54/p54spi_eeprom.h
rename to drivers/net/wireless/intersil/p54/p54spi_eeprom.h
similarity index 100%
rename from drivers/net/wireless/p54/p54usb.c
rename to drivers/net/wireless/intersil/p54/p54usb.c
similarity index 100%
rename from drivers/net/wireless/p54/p54usb.h
rename to drivers/net/wireless/intersil/p54/p54usb.h
similarity index 100%
rename from drivers/net/wireless/p54/txrx.c
rename to drivers/net/wireless/intersil/p54/txrx.c
Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- MAINTAINERS | 2 +- drivers/net/wireless/Kconfig | 1 - drivers/net/wireless/Makefile | 2 -- drivers/net/wireless/intersil/Kconfig | 1 + drivers/net/wireless/intersil/Makefile | 1 + drivers/net/wireless/{ => intersil}/p54/Kconfig | 0 drivers/net/wireless/{ => intersil}/p54/Makefile | 0 drivers/net/wireless/{ => intersil}/p54/eeprom.c | 0 drivers/net/wireless/{ => intersil}/p54/eeprom.h | 0 drivers/net/wireless/{ => intersil}/p54/fwio.c | 0 drivers/net/wireless/{ => intersil}/p54/led.c | 0 drivers/net/wireless/{ => intersil}/p54/lmac.h | 0 drivers/net/wireless/{ => intersil}/p54/main.c | 0 drivers/net/wireless/{ => intersil}/p54/p54.h | 0 drivers/net/wireless/{ => intersil}/p54/p54pci.c | 0 drivers/net/wireless/{ => intersil}/p54/p54pci.h | 0 drivers/net/wireless/{ => intersil}/p54/p54spi.c | 0 drivers/net/wireless/{ => intersil}/p54/p54spi.h | 0 .../wireless/{ => intersil}/p54/p54spi_eeprom.h | 0 drivers/net/wireless/{ => intersil}/p54/p54usb.c | 0 drivers/net/wireless/{ => intersil}/p54/p54usb.h | 0 drivers/net/wireless/{ => intersil}/p54/txrx.c | 0 22 files changed, 3 insertions(+), 4 deletions(-) rename drivers/net/wireless/{ => intersil}/p54/Kconfig (100%) rename drivers/net/wireless/{ => intersil}/p54/Makefile (100%) rename drivers/net/wireless/{ => intersil}/p54/eeprom.c (100%) rename drivers/net/wireless/{ => intersil}/p54/eeprom.h (100%) rename drivers/net/wireless/{ => intersil}/p54/fwio.c (100%) rename drivers/net/wireless/{ => intersil}/p54/led.c (100%) rename drivers/net/wireless/{ => intersil}/p54/lmac.h (100%) rename drivers/net/wireless/{ => intersil}/p54/main.c (100%) rename drivers/net/wireless/{ => intersil}/p54/p54.h (100%) rename drivers/net/wireless/{ => intersil}/p54/p54pci.c (100%) rename drivers/net/wireless/{ => intersil}/p54/p54pci.h (100%) rename drivers/net/wireless/{ => intersil}/p54/p54spi.c (100%) rename drivers/net/wireless/{ => intersil}/p54/p54spi.h (100%) rename drivers/net/wireless/{ => intersil}/p54/p54spi_eeprom.h (100%) rename drivers/net/wireless/{ => intersil}/p54/p54usb.c (100%) rename drivers/net/wireless/{ => intersil}/p54/p54usb.h (100%) rename drivers/net/wireless/{ => intersil}/p54/txrx.c (100%)