OSDN Git Service

p54: move under intersil vendor directory
authorKalle Valo <kvalo@codeaurora.org>
Wed, 18 Nov 2015 07:49:59 +0000 (09:49 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 18 Nov 2015 12:28:31 +0000 (14:28 +0200)
Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
22 files changed:
MAINTAINERS
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/net/wireless/intersil/Kconfig
drivers/net/wireless/intersil/Makefile
drivers/net/wireless/intersil/p54/Kconfig [moved from drivers/net/wireless/p54/Kconfig with 100% similarity]
drivers/net/wireless/intersil/p54/Makefile [moved from drivers/net/wireless/p54/Makefile with 100% similarity]
drivers/net/wireless/intersil/p54/eeprom.c [moved from drivers/net/wireless/p54/eeprom.c with 100% similarity]
drivers/net/wireless/intersil/p54/eeprom.h [moved from drivers/net/wireless/p54/eeprom.h with 100% similarity]
drivers/net/wireless/intersil/p54/fwio.c [moved from drivers/net/wireless/p54/fwio.c with 100% similarity]
drivers/net/wireless/intersil/p54/led.c [moved from drivers/net/wireless/p54/led.c with 100% similarity]
drivers/net/wireless/intersil/p54/lmac.h [moved from drivers/net/wireless/p54/lmac.h with 100% similarity]
drivers/net/wireless/intersil/p54/main.c [moved from drivers/net/wireless/p54/main.c with 100% similarity]
drivers/net/wireless/intersil/p54/p54.h [moved from drivers/net/wireless/p54/p54.h with 100% similarity]
drivers/net/wireless/intersil/p54/p54pci.c [moved from drivers/net/wireless/p54/p54pci.c with 100% similarity]
drivers/net/wireless/intersil/p54/p54pci.h [moved from drivers/net/wireless/p54/p54pci.h with 100% similarity]
drivers/net/wireless/intersil/p54/p54spi.c [moved from drivers/net/wireless/p54/p54spi.c with 100% similarity]
drivers/net/wireless/intersil/p54/p54spi.h [moved from drivers/net/wireless/p54/p54spi.h with 100% similarity]
drivers/net/wireless/intersil/p54/p54spi_eeprom.h [moved from drivers/net/wireless/p54/p54spi_eeprom.h with 100% similarity]
drivers/net/wireless/intersil/p54/p54usb.c [moved from drivers/net/wireless/p54/p54usb.c with 100% similarity]
drivers/net/wireless/intersil/p54/p54usb.h [moved from drivers/net/wireless/p54/p54usb.h with 100% similarity]
drivers/net/wireless/intersil/p54/txrx.c [moved from drivers/net/wireless/p54/txrx.c with 100% similarity]

index 63c601b..818899a 100644 (file)
@@ -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>
index da10b00..bea2fbb 100644 (file)
@@ -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"
index a60c5e5..046963f 100644 (file)
@@ -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
index ec80b91..4bc3688 100644 (file)
@@ -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
index 4890ef7..90a7283 100644 (file)
@@ -1 +1,2 @@
 obj-$(CONFIG_HOSTAP)           += hostap/
+obj-$(CONFIG_P54_COMMON)       += p54/