Ver Fonte

orinoco: move under intersil vendor directory

Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Kalle Valo há 9 anos atrás
pai
commit
2be45b66de
36 ficheiros alterados com 3 adições e 4 exclusões
  1. 1 1
      MAINTAINERS
  2. 0 1
      drivers/net/wireless/Kconfig
  3. 0 2
      drivers/net/wireless/Makefile
  4. 1 0
      drivers/net/wireless/intersil/Kconfig
  5. 1 0
      drivers/net/wireless/intersil/Makefile
  6. 0 0
      drivers/net/wireless/intersil/orinoco/Kconfig
  7. 0 0
      drivers/net/wireless/intersil/orinoco/Makefile
  8. 0 0
      drivers/net/wireless/intersil/orinoco/airport.c
  9. 0 0
      drivers/net/wireless/intersil/orinoco/cfg.c
  10. 0 0
      drivers/net/wireless/intersil/orinoco/cfg.h
  11. 0 0
      drivers/net/wireless/intersil/orinoco/fw.c
  12. 0 0
      drivers/net/wireless/intersil/orinoco/fw.h
  13. 0 0
      drivers/net/wireless/intersil/orinoco/hermes.c
  14. 0 0
      drivers/net/wireless/intersil/orinoco/hermes.h
  15. 0 0
      drivers/net/wireless/intersil/orinoco/hermes_dld.c
  16. 0 0
      drivers/net/wireless/intersil/orinoco/hermes_dld.h
  17. 0 0
      drivers/net/wireless/intersil/orinoco/hermes_rid.h
  18. 0 0
      drivers/net/wireless/intersil/orinoco/hw.c
  19. 0 0
      drivers/net/wireless/intersil/orinoco/hw.h
  20. 0 0
      drivers/net/wireless/intersil/orinoco/main.c
  21. 0 0
      drivers/net/wireless/intersil/orinoco/main.h
  22. 0 0
      drivers/net/wireless/intersil/orinoco/mic.c
  23. 0 0
      drivers/net/wireless/intersil/orinoco/mic.h
  24. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco.h
  25. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco_cs.c
  26. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
  27. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco_pci.c
  28. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco_pci.h
  29. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco_plx.c
  30. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
  31. 0 0
      drivers/net/wireless/intersil/orinoco/orinoco_usb.c
  32. 0 0
      drivers/net/wireless/intersil/orinoco/scan.c
  33. 0 0
      drivers/net/wireless/intersil/orinoco/scan.h
  34. 0 0
      drivers/net/wireless/intersil/orinoco/spectrum_cs.c
  35. 0 0
      drivers/net/wireless/intersil/orinoco/wext.c
  36. 0 0
      drivers/net/wireless/intersil/orinoco/wext.h

+ 1 - 1
MAINTAINERS

@@ -7930,7 +7930,7 @@ L:	linux-wireless@vger.kernel.org
 W:	http://wireless.kernel.org/en/users/Drivers/orinoco
 W:	http://www.nongnu.org/orinoco/
 S:	Orphan
-F:	drivers/net/wireless/orinoco/
+F:	drivers/net/wireless/intersil/orinoco/
 
 OSD LIBRARY and FILESYSTEM
 M:	Boaz Harrosh <ooo@electrozaur.com>

+ 0 - 1
drivers/net/wireless/Kconfig

@@ -117,7 +117,6 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/realtek/rtlwifi/Kconfig"

+ 0 - 2
drivers/net/wireless/Makefile

@@ -12,8 +12,6 @@ obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
-obj-$(CONFIG_HERMES)		+= orinoco/
-
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_WLAN)		+= realtek/

+ 1 - 0
drivers/net/wireless/intersil/Kconfig

@@ -12,6 +12,7 @@ config WLAN_VENDOR_INTERSIL
 if WLAN_VENDOR_INTERSIL
 
 source "drivers/net/wireless/intersil/hostap/Kconfig"
+source "drivers/net/wireless/intersil/orinoco/Kconfig"
 source "drivers/net/wireless/intersil/p54/Kconfig"
 
 endif # WLAN_VENDOR_INTERSIL

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

@@ -1,2 +1,3 @@
 obj-$(CONFIG_HOSTAP)		+= hostap/
+obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_P54_COMMON)	+= p54/

+ 0 - 0
drivers/net/wireless/orinoco/Kconfig → drivers/net/wireless/intersil/orinoco/Kconfig


+ 0 - 0
drivers/net/wireless/orinoco/Makefile → drivers/net/wireless/intersil/orinoco/Makefile


+ 0 - 0
drivers/net/wireless/orinoco/airport.c → drivers/net/wireless/intersil/orinoco/airport.c


+ 0 - 0
drivers/net/wireless/orinoco/cfg.c → drivers/net/wireless/intersil/orinoco/cfg.c


+ 0 - 0
drivers/net/wireless/orinoco/cfg.h → drivers/net/wireless/intersil/orinoco/cfg.h


+ 0 - 0
drivers/net/wireless/orinoco/fw.c → drivers/net/wireless/intersil/orinoco/fw.c


+ 0 - 0
drivers/net/wireless/orinoco/fw.h → drivers/net/wireless/intersil/orinoco/fw.h


+ 0 - 0
drivers/net/wireless/orinoco/hermes.c → drivers/net/wireless/intersil/orinoco/hermes.c


+ 0 - 0
drivers/net/wireless/orinoco/hermes.h → drivers/net/wireless/intersil/orinoco/hermes.h


+ 0 - 0
drivers/net/wireless/orinoco/hermes_dld.c → drivers/net/wireless/intersil/orinoco/hermes_dld.c


+ 0 - 0
drivers/net/wireless/orinoco/hermes_dld.h → drivers/net/wireless/intersil/orinoco/hermes_dld.h


+ 0 - 0
drivers/net/wireless/orinoco/hermes_rid.h → drivers/net/wireless/intersil/orinoco/hermes_rid.h


+ 0 - 0
drivers/net/wireless/orinoco/hw.c → drivers/net/wireless/intersil/orinoco/hw.c


+ 0 - 0
drivers/net/wireless/orinoco/hw.h → drivers/net/wireless/intersil/orinoco/hw.h


+ 0 - 0
drivers/net/wireless/orinoco/main.c → drivers/net/wireless/intersil/orinoco/main.c


+ 0 - 0
drivers/net/wireless/orinoco/main.h → drivers/net/wireless/intersil/orinoco/main.h


+ 0 - 0
drivers/net/wireless/orinoco/mic.c → drivers/net/wireless/intersil/orinoco/mic.c


+ 0 - 0
drivers/net/wireless/orinoco/mic.h → drivers/net/wireless/intersil/orinoco/mic.h


+ 0 - 0
drivers/net/wireless/orinoco/orinoco.h → drivers/net/wireless/intersil/orinoco/orinoco.h


+ 0 - 0
drivers/net/wireless/orinoco/orinoco_cs.c → drivers/net/wireless/intersil/orinoco/orinoco_cs.c


+ 0 - 0
drivers/net/wireless/orinoco/orinoco_nortel.c → drivers/net/wireless/intersil/orinoco/orinoco_nortel.c


+ 0 - 0
drivers/net/wireless/orinoco/orinoco_pci.c → drivers/net/wireless/intersil/orinoco/orinoco_pci.c


+ 0 - 0
drivers/net/wireless/orinoco/orinoco_pci.h → drivers/net/wireless/intersil/orinoco/orinoco_pci.h


+ 0 - 0
drivers/net/wireless/orinoco/orinoco_plx.c → drivers/net/wireless/intersil/orinoco/orinoco_plx.c


+ 0 - 0
drivers/net/wireless/orinoco/orinoco_tmd.c → drivers/net/wireless/intersil/orinoco/orinoco_tmd.c


+ 0 - 0
drivers/net/wireless/orinoco/orinoco_usb.c → drivers/net/wireless/intersil/orinoco/orinoco_usb.c


+ 0 - 0
drivers/net/wireless/orinoco/scan.c → drivers/net/wireless/intersil/orinoco/scan.c


+ 0 - 0
drivers/net/wireless/orinoco/scan.h → drivers/net/wireless/intersil/orinoco/scan.h


+ 0 - 0
drivers/net/wireless/orinoco/spectrum_cs.c → drivers/net/wireless/intersil/orinoco/spectrum_cs.c


+ 0 - 0
drivers/net/wireless/orinoco/wext.c → drivers/net/wireless/intersil/orinoco/wext.c


+ 0 - 0
drivers/net/wireless/orinoco/wext.h → drivers/net/wireless/intersil/orinoco/wext.h