---

yaml --- r: 149885 b: refs/heads/master c: 203c480 h: refs/heads/master i: 149883: c168963 v: v3
git-mirror · Apr 22, 2009 · 0ec69f1 · 0ec69f1
1 parent 9e0afdf
commit 0ec69f1
Show file tree

Hide file tree

Showing 70 changed files with 13 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1878f77e13b9d720b78c4f818b94bfd4a7f596e5
+refs/heads/master: 203c4805e91786f9a010bc7945a0fde70c9da28e
diff --git a/trunk/drivers/net/wireless/Kconfig b/trunk/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"

diff --git a/trunk/drivers/net/wireless/Makefile b/trunk/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
diff --git a/trunk/drivers/net/wireless/ath/Kconfig b/trunk/drivers/net/wireless/ath/Kconfig
@@ -1,4 +1,8 @@
 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"
+
diff --git a/trunk/drivers/net/wireless/ath/Makefile b/trunk/drivers/net/wireless/ath/Makefile
@@ -1,3 +1,7 @@
+obj-$(CONFIG_ATH5K)		+= ath5k/
+obj-$(CONFIG_ATH9K)		+= ath9k/
+obj-$(CONFIG_AR9170_USB)        += ar9170/
+
 obj-$(CONFIG_ATH_COMMON)	+= ath.o
 ath-objs 		:= regd.o
 
diff --git a/trunk/drivers/net/wireless/ar9170/Kconfig → ...k/drivers/net/wireless/ath/ar9170/Kconfig b/trunk/drivers/net/wireless/ar9170/Kconfig → ...k/drivers/net/wireless/ath/ar9170/Kconfig
diff --git a/trunk/drivers/net/wireless/ar9170/Makefile → .../drivers/net/wireless/ath/ar9170/Makefile b/trunk/drivers/net/wireless/ar9170/Makefile → .../drivers/net/wireless/ath/ar9170/Makefile
diff --git a/trunk/drivers/net/wireless/ar9170/ar9170.h → .../drivers/net/wireless/ath/ar9170/ar9170.h b/trunk/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)
 

diff --git a/trunk/drivers/net/wireless/ar9170/cmd.c → trunk/drivers/net/wireless/ath/ar9170/cmd.c b/trunk/drivers/net/wireless/ar9170/cmd.c → trunk/drivers/net/wireless/ath/ar9170/cmd.c
diff --git a/trunk/drivers/net/wireless/ar9170/cmd.h → trunk/drivers/net/wireless/ath/ar9170/cmd.h b/trunk/drivers/net/wireless/ar9170/cmd.h → trunk/drivers/net/wireless/ath/ar9170/cmd.h
diff --git a/trunk/drivers/net/wireless/ar9170/eeprom.h → .../drivers/net/wireless/ath/ar9170/eeprom.h b/trunk/drivers/net/wireless/ar9170/eeprom.h → .../drivers/net/wireless/ath/ar9170/eeprom.h
diff --git a/trunk/drivers/net/wireless/ar9170/hw.h → trunk/drivers/net/wireless/ath/ar9170/hw.h b/trunk/drivers/net/wireless/ar9170/hw.h → trunk/drivers/net/wireless/ath/ar9170/hw.h
diff --git a/trunk/drivers/net/wireless/ar9170/led.c → trunk/drivers/net/wireless/ath/ar9170/led.c b/trunk/drivers/net/wireless/ar9170/led.c → trunk/drivers/net/wireless/ath/ar9170/led.c
diff --git a/trunk/drivers/net/wireless/ar9170/mac.c → trunk/drivers/net/wireless/ath/ar9170/mac.c b/trunk/drivers/net/wireless/ar9170/mac.c → trunk/drivers/net/wireless/ath/ar9170/mac.c
diff --git a/trunk/drivers/net/wireless/ar9170/main.c → trunk/drivers/net/wireless/ath/ar9170/main.c b/trunk/drivers/net/wireless/ar9170/main.c → trunk/drivers/net/wireless/ath/ar9170/main.c
diff --git a/trunk/drivers/net/wireless/ar9170/phy.c → trunk/drivers/net/wireless/ath/ar9170/phy.c b/trunk/drivers/net/wireless/ar9170/phy.c → trunk/drivers/net/wireless/ath/ar9170/phy.c
diff --git a/trunk/drivers/net/wireless/ar9170/usb.c → trunk/drivers/net/wireless/ath/ar9170/usb.c b/trunk/drivers/net/wireless/ar9170/usb.c → trunk/drivers/net/wireless/ath/ar9170/usb.c
diff --git a/trunk/drivers/net/wireless/ar9170/usb.h → trunk/drivers/net/wireless/ath/ar9170/usb.h b/trunk/drivers/net/wireless/ar9170/usb.h → trunk/drivers/net/wireless/ath/ar9170/usb.h
diff --git a/trunk/drivers/net/wireless/ath5k/Kconfig → trunk/drivers/net/wireless/ath/ath5k/Kconfig b/trunk/drivers/net/wireless/ath5k/Kconfig → trunk/drivers/net/wireless/ath/ath5k/Kconfig
diff --git a/trunk/drivers/net/wireless/ath5k/Makefile → ...k/drivers/net/wireless/ath/ath5k/Makefile b/trunk/drivers/net/wireless/ath5k/Makefile → ...k/drivers/net/wireless/ath/ath5k/Makefile
diff --git a/trunk/drivers/net/wireless/ath5k/ath5k.h → trunk/drivers/net/wireless/ath/ath5k/ath5k.h b/trunk/drivers/net/wireless/ath5k/ath5k.h → trunk/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 */

diff --git a/trunk/drivers/net/wireless/ath5k/attach.c → ...k/drivers/net/wireless/ath/ath5k/attach.c b/trunk/drivers/net/wireless/ath5k/attach.c → ...k/drivers/net/wireless/ath/ath5k/attach.c
diff --git a/trunk/drivers/net/wireless/ath5k/base.c → trunk/drivers/net/wireless/ath/ath5k/base.c b/trunk/drivers/net/wireless/ath5k/base.c → trunk/drivers/net/wireless/ath/ath5k/base.c
diff --git a/trunk/drivers/net/wireless/ath5k/base.h → trunk/drivers/net/wireless/ath/ath5k/base.h b/trunk/drivers/net/wireless/ath5k/base.h → trunk/drivers/net/wireless/ath/ath5k/base.h
diff --git a/trunk/drivers/net/wireless/ath5k/caps.c → trunk/drivers/net/wireless/ath/ath5k/caps.c b/trunk/drivers/net/wireless/ath5k/caps.c → trunk/drivers/net/wireless/ath/ath5k/caps.c
diff --git a/trunk/drivers/net/wireless/ath5k/debug.c → trunk/drivers/net/wireless/ath/ath5k/debug.c b/trunk/drivers/net/wireless/ath5k/debug.c → trunk/drivers/net/wireless/ath/ath5k/debug.c
diff --git a/trunk/drivers/net/wireless/ath5k/debug.h → trunk/drivers/net/wireless/ath/ath5k/debug.h b/trunk/drivers/net/wireless/ath5k/debug.h → trunk/drivers/net/wireless/ath/ath5k/debug.h
diff --git a/trunk/drivers/net/wireless/ath5k/desc.c → trunk/drivers/net/wireless/ath/ath5k/desc.c b/trunk/drivers/net/wireless/ath5k/desc.c → trunk/drivers/net/wireless/ath/ath5k/desc.c
diff --git a/trunk/drivers/net/wireless/ath5k/desc.h → trunk/drivers/net/wireless/ath/ath5k/desc.h b/trunk/drivers/net/wireless/ath5k/desc.h → trunk/drivers/net/wireless/ath/ath5k/desc.h
diff --git a/trunk/drivers/net/wireless/ath5k/dma.c → trunk/drivers/net/wireless/ath/ath5k/dma.c b/trunk/drivers/net/wireless/ath5k/dma.c → trunk/drivers/net/wireless/ath/ath5k/dma.c
diff --git a/trunk/drivers/net/wireless/ath5k/eeprom.c → ...k/drivers/net/wireless/ath/ath5k/eeprom.c b/trunk/drivers/net/wireless/ath5k/eeprom.c → ...k/drivers/net/wireless/ath/ath5k/eeprom.c
diff --git a/trunk/drivers/net/wireless/ath5k/eeprom.h → ...k/drivers/net/wireless/ath/ath5k/eeprom.h b/trunk/drivers/net/wireless/ath5k/eeprom.h → ...k/drivers/net/wireless/ath/ath5k/eeprom.h
diff --git a/trunk/drivers/net/wireless/ath5k/gpio.c → trunk/drivers/net/wireless/ath/ath5k/gpio.c b/trunk/drivers/net/wireless/ath5k/gpio.c → trunk/drivers/net/wireless/ath/ath5k/gpio.c
diff --git a/trunk/drivers/net/wireless/ath5k/initvals.c → ...drivers/net/wireless/ath/ath5k/initvals.c b/trunk/drivers/net/wireless/ath5k/initvals.c → ...drivers/net/wireless/ath/ath5k/initvals.c
diff --git a/trunk/drivers/net/wireless/ath5k/led.c → trunk/drivers/net/wireless/ath/ath5k/led.c b/trunk/drivers/net/wireless/ath5k/led.c → trunk/drivers/net/wireless/ath/ath5k/led.c
diff --git a/trunk/drivers/net/wireless/ath5k/pcu.c → trunk/drivers/net/wireless/ath/ath5k/pcu.c b/trunk/drivers/net/wireless/ath5k/pcu.c → trunk/drivers/net/wireless/ath/ath5k/pcu.c
diff --git a/trunk/drivers/net/wireless/ath5k/phy.c → trunk/drivers/net/wireless/ath/ath5k/phy.c b/trunk/drivers/net/wireless/ath5k/phy.c → trunk/drivers/net/wireless/ath/ath5k/phy.c
diff --git a/trunk/drivers/net/wireless/ath5k/qcu.c → trunk/drivers/net/wireless/ath/ath5k/qcu.c b/trunk/drivers/net/wireless/ath5k/qcu.c → trunk/drivers/net/wireless/ath/ath5k/qcu.c
diff --git a/trunk/drivers/net/wireless/ath5k/reg.h → trunk/drivers/net/wireless/ath/ath5k/reg.h b/trunk/drivers/net/wireless/ath5k/reg.h → trunk/drivers/net/wireless/ath/ath5k/reg.h
diff --git a/trunk/drivers/net/wireless/ath5k/reset.c → trunk/drivers/net/wireless/ath/ath5k/reset.c b/trunk/drivers/net/wireless/ath5k/reset.c → trunk/drivers/net/wireless/ath/ath5k/reset.c
diff --git a/trunk/drivers/net/wireless/ath5k/rfbuffer.h → ...drivers/net/wireless/ath/ath5k/rfbuffer.h b/trunk/drivers/net/wireless/ath5k/rfbuffer.h → ...drivers/net/wireless/ath/ath5k/rfbuffer.h
diff --git a/trunk/drivers/net/wireless/ath5k/rfgain.h → ...k/drivers/net/wireless/ath/ath5k/rfgain.h b/trunk/drivers/net/wireless/ath5k/rfgain.h → ...k/drivers/net/wireless/ath/ath5k/rfgain.h
diff --git a/trunk/drivers/net/wireless/ath9k/Kconfig → trunk/drivers/net/wireless/ath/ath9k/Kconfig b/trunk/drivers/net/wireless/ath9k/Kconfig → trunk/drivers/net/wireless/ath/ath9k/Kconfig
diff --git a/trunk/drivers/net/wireless/ath9k/Makefile → ...k/drivers/net/wireless/ath/ath9k/Makefile b/trunk/drivers/net/wireless/ath9k/Makefile → ...k/drivers/net/wireless/ath/ath9k/Makefile
diff --git a/trunk/drivers/net/wireless/ath9k/ahb.c → trunk/drivers/net/wireless/ath/ath9k/ahb.c b/trunk/drivers/net/wireless/ath9k/ahb.c → trunk/drivers/net/wireless/ath/ath9k/ahb.c
diff --git a/trunk/drivers/net/wireless/ath9k/ani.c → trunk/drivers/net/wireless/ath/ath9k/ani.c b/trunk/drivers/net/wireless/ath9k/ani.c → trunk/drivers/net/wireless/ath/ath9k/ani.c
diff --git a/trunk/drivers/net/wireless/ath9k/ani.h → trunk/drivers/net/wireless/ath/ath9k/ani.h b/trunk/drivers/net/wireless/ath9k/ani.h → trunk/drivers/net/wireless/ath/ath9k/ani.h
diff --git a/trunk/drivers/net/wireless/ath9k/ath9k.h → trunk/drivers/net/wireless/ath/ath9k/ath9k.h b/trunk/drivers/net/wireless/ath9k/ath9k.h → trunk/drivers/net/wireless/ath/ath9k/ath9k.h
diff --git a/trunk/drivers/net/wireless/ath9k/beacon.c → ...k/drivers/net/wireless/ath/ath9k/beacon.c b/trunk/drivers/net/wireless/ath9k/beacon.c → ...k/drivers/net/wireless/ath/ath9k/beacon.c
diff --git a/trunk/drivers/net/wireless/ath9k/calib.c → trunk/drivers/net/wireless/ath/ath9k/calib.c b/trunk/drivers/net/wireless/ath9k/calib.c → trunk/drivers/net/wireless/ath/ath9k/calib.c
diff --git a/trunk/drivers/net/wireless/ath9k/calib.h → trunk/drivers/net/wireless/ath/ath9k/calib.h b/trunk/drivers/net/wireless/ath9k/calib.h → trunk/drivers/net/wireless/ath/ath9k/calib.h
diff --git a/trunk/drivers/net/wireless/ath9k/debug.c → trunk/drivers/net/wireless/ath/ath9k/debug.c b/trunk/drivers/net/wireless/ath9k/debug.c → trunk/drivers/net/wireless/ath/ath9k/debug.c
diff --git a/trunk/drivers/net/wireless/ath9k/debug.h → trunk/drivers/net/wireless/ath/ath9k/debug.h b/trunk/drivers/net/wireless/ath9k/debug.h → trunk/drivers/net/wireless/ath/ath9k/debug.h
diff --git a/trunk/drivers/net/wireless/ath9k/eeprom.c → ...k/drivers/net/wireless/ath/ath9k/eeprom.c b/trunk/drivers/net/wireless/ath9k/eeprom.c → ...k/drivers/net/wireless/ath/ath9k/eeprom.c
diff --git a/trunk/drivers/net/wireless/ath9k/eeprom.h → ...k/drivers/net/wireless/ath/ath9k/eeprom.h b/trunk/drivers/net/wireless/ath9k/eeprom.h → ...k/drivers/net/wireless/ath/ath9k/eeprom.h
diff --git a/trunk/drivers/net/wireless/ath9k/hw.c → trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath9k/hw.c → trunk/drivers/net/wireless/ath/ath9k/hw.c
diff --git a/trunk/drivers/net/wireless/ath9k/hw.h → trunk/drivers/net/wireless/ath/ath9k/hw.h b/trunk/drivers/net/wireless/ath9k/hw.h → trunk/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

diff --git a/trunk/drivers/net/wireless/ath9k/initvals.h → ...drivers/net/wireless/ath/ath9k/initvals.h b/trunk/drivers/net/wireless/ath9k/initvals.h → ...drivers/net/wireless/ath/ath9k/initvals.h
diff --git a/trunk/drivers/net/wireless/ath9k/mac.c → trunk/drivers/net/wireless/ath/ath9k/mac.c b/trunk/drivers/net/wireless/ath9k/mac.c → trunk/drivers/net/wireless/ath/ath9k/mac.c
diff --git a/trunk/drivers/net/wireless/ath9k/mac.h → trunk/drivers/net/wireless/ath/ath9k/mac.h b/trunk/drivers/net/wireless/ath9k/mac.h → trunk/drivers/net/wireless/ath/ath9k/mac.h
diff --git a/trunk/drivers/net/wireless/ath9k/main.c → trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath9k/main.c → trunk/drivers/net/wireless/ath/ath9k/main.c
diff --git a/trunk/drivers/net/wireless/ath9k/pci.c → trunk/drivers/net/wireless/ath/ath9k/pci.c b/trunk/drivers/net/wireless/ath9k/pci.c → trunk/drivers/net/wireless/ath/ath9k/pci.c
diff --git a/trunk/drivers/net/wireless/ath9k/phy.c → trunk/drivers/net/wireless/ath/ath9k/phy.c b/trunk/drivers/net/wireless/ath9k/phy.c → trunk/drivers/net/wireless/ath/ath9k/phy.c
diff --git a/trunk/drivers/net/wireless/ath9k/phy.h → trunk/drivers/net/wireless/ath/ath9k/phy.h b/trunk/drivers/net/wireless/ath9k/phy.h → trunk/drivers/net/wireless/ath/ath9k/phy.h
diff --git a/trunk/drivers/net/wireless/ath9k/rc.c → trunk/drivers/net/wireless/ath/ath9k/rc.c b/trunk/drivers/net/wireless/ath9k/rc.c → trunk/drivers/net/wireless/ath/ath9k/rc.c
diff --git a/trunk/drivers/net/wireless/ath9k/rc.h → trunk/drivers/net/wireless/ath/ath9k/rc.h b/trunk/drivers/net/wireless/ath9k/rc.h → trunk/drivers/net/wireless/ath/ath9k/rc.h
diff --git a/trunk/drivers/net/wireless/ath9k/recv.c → trunk/drivers/net/wireless/ath/ath9k/recv.c b/trunk/drivers/net/wireless/ath9k/recv.c → trunk/drivers/net/wireless/ath/ath9k/recv.c
diff --git a/trunk/drivers/net/wireless/ath9k/reg.h → trunk/drivers/net/wireless/ath/ath9k/reg.h b/trunk/drivers/net/wireless/ath9k/reg.h → trunk/drivers/net/wireless/ath/ath9k/reg.h
diff --git a/trunk/drivers/net/wireless/ath9k/virtual.c → .../drivers/net/wireless/ath/ath9k/virtual.c b/trunk/drivers/net/wireless/ath9k/virtual.c → .../drivers/net/wireless/ath/ath9k/virtual.c
diff --git a/trunk/drivers/net/wireless/ath9k/xmit.c → trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath9k/xmit.c → trunk/drivers/net/wireless/ath/ath9k/xmit.c