atheros: put atheros wireless drivers into ath/

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/Kconfig

@@ -484,9 +484,6 @@ config MWL8K
 
 source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/ath5k/Kconfig"
-source "drivers/net/wireless/ath9k/Kconfig"
-source "drivers/net/wireless/ar9170/Kconfig"
 source "drivers/net/wireless/ipw2x00/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"

drivers/net/wireless/Makefile

@@ -56,8 +56,5 @@ obj-$(CONFIG_RT2X00)	+= rt2x00/
 obj-$(CONFIG_P54_COMMON)	+= p54/
 
 obj-$(CONFIG_ATH_COMMON)	+= ath/
-obj-$(CONFIG_ATH5K)	+= ath5k/
-obj-$(CONFIG_ATH9K)	+= ath9k/
-obj-$(CONFIG_AR9170_USB)	+= ar9170/
 
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o

drivers/net/wireless/ath/Kconfig

 config ATH_COMMON
-	tristate "Atheros Wireless Cards Shared Support"
+	tristate "Atheros Wireless Cards"
 	depends on ATH5K || ATH9K || AR9170_USB
 
+source "drivers/net/wireless/ath/ath5k/Kconfig"
+source "drivers/net/wireless/ath/ath9k/Kconfig"
+source "drivers/net/wireless/ath/ar9170/Kconfig"
+

drivers/net/wireless/ath/Makefile

+obj-$(CONFIG_ATH5K)		+= ath5k/
+obj-$(CONFIG_ATH9K)		+= ath9k/
+obj-$(CONFIG_AR9170_USB)        += ar9170/
+
 obj-$(CONFIG_ATH_COMMON)	+= ath.o
 ath-objs 		:= regd.o
 

drivers/net/wireless/ar9170/ar9170.h → drivers/net/wireless/ath/ar9170/ar9170.h

@@ -48,7 +48,7 @@
 #include "eeprom.h"
 #include "hw.h"
 
-#include "../ath/regd.h"
+#include "../regd.h"
 
 #define PAYLOAD_MAX	(AR9170_MAX_CMD_LEN/4 - 1)
 

drivers/net/wireless/ath5k/ath5k.h → drivers/net/wireless/ath/ath5k/ath5k.h

@@ -27,7 +27,7 @@
 #include <linux/types.h>
 #include <net/mac80211.h>
 
-#include "../ath/regd.h"
+#include "../regd.h"
 
 /* RX/TX descriptor hw structs
  * TODO: Driver part should only see sw structs */

drivers/net/wireless/ath9k/hw.h → drivers/net/wireless/ath/ath9k/hw.h

@@ -28,7 +28,7 @@
 #include "reg.h"
 #include "phy.h"
 
-#include "../ath/regd.h"
+#include "../regd.h"
 
 #define ATHEROS_VENDOR_ID	0x168c
 #define AR5416_DEVID_PCI	0x0023