浏览代码

rt2x00: move under ralink vendor directory

Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Kalle Valo 9 年之前
父节点
当前提交
33aca94d79
共有 51 个文件被更改,包括 20 次插入4 次删除
  1. 1 1
      MAINTAINERS
  2. 1 1
      drivers/net/wireless/Kconfig
  3. 1 2
      drivers/net/wireless/Makefile
  4. 16 0
      drivers/net/wireless/ralink/Kconfig
  5. 1 0
      drivers/net/wireless/ralink/Makefile
  6. 0 0
      drivers/net/wireless/ralink/rt2x00/Kconfig
  7. 0 0
      drivers/net/wireless/ralink/rt2x00/Makefile
  8. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2400pci.c
  9. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2400pci.h
  10. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2500pci.c
  11. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2500pci.h
  12. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2500usb.c
  13. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2500usb.h
  14. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800.h
  15. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  16. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  17. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
  18. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
  19. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800pci.c
  20. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800pci.h
  21. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800soc.c
  22. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800usb.c
  23. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2800usb.h
  24. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00.h
  25. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00config.c
  26. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c
  27. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
  28. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00debug.h
  29. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
  30. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00dump.h
  31. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c
  32. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
  33. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00leds.h
  34. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00lib.h
  35. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00link.c
  36. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
  37. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c
  38. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h
  39. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
  40. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00pci.h
  41. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
  42. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
  43. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00reg.h
  44. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00soc.c
  45. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00soc.h
  46. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
  47. 0 0
      drivers/net/wireless/ralink/rt2x00/rt2x00usb.h
  48. 0 0
      drivers/net/wireless/ralink/rt2x00/rt61pci.c
  49. 0 0
      drivers/net/wireless/ralink/rt2x00/rt61pci.h
  50. 0 0
      drivers/net/wireless/ralink/rt2x00/rt73usb.c
  51. 0 0
      drivers/net/wireless/ralink/rt2x00/rt73usb.h

+ 1 - 1
MAINTAINERS

@@ -8801,7 +8801,7 @@ M:	Stanislaw Gruszka <sgruszka@redhat.com>
 M:	Helmut Schaa <helmut.schaa@googlemail.com>
 L:	linux-wireless@vger.kernel.org
 S:	Maintained
-F:	drivers/net/wireless/rt2x00/
+F:	drivers/net/wireless/ralink/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
 M:	Jens Axboe <axboe@kernel.dk>

+ 1 - 1
drivers/net/wireless/Kconfig

@@ -24,6 +24,7 @@ source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
+source "drivers/net/wireless/ralink/Kconfig"
 source "drivers/net/wireless/realtek/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
@@ -97,7 +98,6 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 

+ 1 - 2
drivers/net/wireless/Makefile

@@ -9,6 +9,7 @@ obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
+obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
 obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
@@ -20,8 +21,6 @@ obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
-obj-$(CONFIG_RT2X00)	+= rt2x00/
-
 obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
 
 obj-$(CONFIG_ATH_CARDS)		+= ath/

+ 16 - 0
drivers/net/wireless/ralink/Kconfig

@@ -0,0 +1,16 @@
+config WLAN_VENDOR_RALINK
+	bool "Ralink devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_RALINK
+
+source "drivers/net/wireless/ralink/rt2x00/Kconfig"
+
+endif # WLAN_VENDOR_RALINK

+ 1 - 0
drivers/net/wireless/ralink/Makefile

@@ -0,0 +1 @@
+obj-$(CONFIG_RT2X00)	+= rt2x00/

+ 0 - 0
drivers/net/wireless/rt2x00/Kconfig → drivers/net/wireless/ralink/rt2x00/Kconfig


+ 0 - 0
drivers/net/wireless/rt2x00/Makefile → drivers/net/wireless/ralink/rt2x00/Makefile


+ 0 - 0
drivers/net/wireless/rt2x00/rt2400pci.c → drivers/net/wireless/ralink/rt2x00/rt2400pci.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2400pci.h → drivers/net/wireless/ralink/rt2x00/rt2400pci.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2500pci.c → drivers/net/wireless/ralink/rt2x00/rt2500pci.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2500pci.h → drivers/net/wireless/ralink/rt2x00/rt2500pci.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2500usb.c → drivers/net/wireless/ralink/rt2x00/rt2500usb.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2500usb.h → drivers/net/wireless/ralink/rt2x00/rt2500usb.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800.h → drivers/net/wireless/ralink/rt2x00/rt2800.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800lib.c → drivers/net/wireless/ralink/rt2x00/rt2800lib.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800lib.h → drivers/net/wireless/ralink/rt2x00/rt2800lib.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800mmio.c → drivers/net/wireless/ralink/rt2x00/rt2800mmio.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800mmio.h → drivers/net/wireless/ralink/rt2x00/rt2800mmio.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800pci.c → drivers/net/wireless/ralink/rt2x00/rt2800pci.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800pci.h → drivers/net/wireless/ralink/rt2x00/rt2800pci.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800soc.c → drivers/net/wireless/ralink/rt2x00/rt2800soc.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800usb.c → drivers/net/wireless/ralink/rt2x00/rt2800usb.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2800usb.h → drivers/net/wireless/ralink/rt2x00/rt2800usb.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00.h → drivers/net/wireless/ralink/rt2x00/rt2x00.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00config.c → drivers/net/wireless/ralink/rt2x00/rt2x00config.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00crypto.c → drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00debug.c → drivers/net/wireless/ralink/rt2x00/rt2x00debug.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00debug.h → drivers/net/wireless/ralink/rt2x00/rt2x00debug.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00dev.c → drivers/net/wireless/ralink/rt2x00/rt2x00dev.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00dump.h → drivers/net/wireless/ralink/rt2x00/rt2x00dump.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00firmware.c → drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00leds.c → drivers/net/wireless/ralink/rt2x00/rt2x00leds.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00leds.h → drivers/net/wireless/ralink/rt2x00/rt2x00leds.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00lib.h → drivers/net/wireless/ralink/rt2x00/rt2x00lib.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00link.c → drivers/net/wireless/ralink/rt2x00/rt2x00link.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00mac.c → drivers/net/wireless/ralink/rt2x00/rt2x00mac.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00mmio.c → drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00mmio.h → drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00pci.c → drivers/net/wireless/ralink/rt2x00/rt2x00pci.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00pci.h → drivers/net/wireless/ralink/rt2x00/rt2x00pci.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00queue.c → drivers/net/wireless/ralink/rt2x00/rt2x00queue.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00queue.h → drivers/net/wireless/ralink/rt2x00/rt2x00queue.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00reg.h → drivers/net/wireless/ralink/rt2x00/rt2x00reg.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00soc.c → drivers/net/wireless/ralink/rt2x00/rt2x00soc.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00soc.h → drivers/net/wireless/ralink/rt2x00/rt2x00soc.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00usb.c → drivers/net/wireless/ralink/rt2x00/rt2x00usb.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt2x00usb.h → drivers/net/wireless/ralink/rt2x00/rt2x00usb.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt61pci.c → drivers/net/wireless/ralink/rt2x00/rt61pci.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt61pci.h → drivers/net/wireless/ralink/rt2x00/rt61pci.h


+ 0 - 0
drivers/net/wireless/rt2x00/rt73usb.c → drivers/net/wireless/ralink/rt2x00/rt73usb.c


+ 0 - 0
drivers/net/wireless/rt2x00/rt73usb.h → drivers/net/wireless/ralink/rt2x00/rt73usb.h