---

yaml --- r: 314218 b: refs/heads/master c: 6468a01 h: refs/heads/master v: v3
git-mirror · Jun 6, 2012 · ff02dc7 · ff02dc7
1 parent 676356c
commit ff02dc7
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76a3aa89937cf0b9a560e4c778e54e993018da60
+refs/heads/master: 6468a01a7181f3572a3e686910016f89ee71ff45
diff --git a/trunk/drivers/net/wireless/iwlwifi/Makefile b/trunk/drivers/net/wireless/iwlwifi/Makefile
@@ -15,17 +15,13 @@ CFLAGS_iwl-devtrace.o := -I$(src)
 
 # WIFI
 obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o
-iwlwifi-objs		+= iwl-5000.o
-iwlwifi-objs		+= iwl-6000.o
-iwlwifi-objs		+= iwl-1000.o
-iwlwifi-objs		+= iwl-2000.o
 iwlwifi-objs		+= iwl-io.o
-iwlwifi-objs		+= iwl-pci.o
 iwlwifi-objs		+= iwl-drv.o
 iwlwifi-objs		+= iwl-debug.o
 iwlwifi-objs		+= iwl-notif-wait.o
-iwlwifi-objs		+= iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
+iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
+iwlwifi-objs		+= pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o
 
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 
-ccflags-y += -D__CHECK_ENDIAN__
+ccflags-y += -D__CHECK_ENDIAN__ -I$(src)
diff --git a/...k/drivers/net/wireless/iwlwifi/iwl-1000.c → .../drivers/net/wireless/iwlwifi/pcie/1000.c b/...k/drivers/net/wireless/iwlwifi/iwl-1000.c → .../drivers/net/wireless/iwlwifi/pcie/1000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-csr.h"
 #include "iwl-agn-hw.h"
+#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL1000_UCODE_API_MAX 5

diff --git a/...k/drivers/net/wireless/iwlwifi/iwl-2000.c → .../drivers/net/wireless/iwlwifi/pcie/2000.c b/...k/drivers/net/wireless/iwlwifi/iwl-2000.c → .../drivers/net/wireless/iwlwifi/pcie/2000.c
@@ -27,8 +27,8 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
+#include "cfg.h"
 #include "iwl-commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */

diff --git a/...k/drivers/net/wireless/iwlwifi/iwl-5000.c → .../drivers/net/wireless/iwlwifi/pcie/5000.c b/...k/drivers/net/wireless/iwlwifi/iwl-5000.c → .../drivers/net/wireless/iwlwifi/pcie/5000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
 #include "iwl-csr.h"
+#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL5000_UCODE_API_MAX 5

diff --git a/...k/drivers/net/wireless/iwlwifi/iwl-6000.c → .../drivers/net/wireless/iwlwifi/pcie/6000.c b/...k/drivers/net/wireless/iwlwifi/iwl-6000.c → .../drivers/net/wireless/iwlwifi/pcie/6000.c
@@ -27,8 +27,8 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
+#include "cfg.h"
 #include "iwl-commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */

diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-cfg.h → ...k/drivers/net/wireless/iwlwifi/pcie/cfg.h b/trunk/drivers/net/wireless/iwlwifi/iwl-cfg.h → ...k/drivers/net/wireless/iwlwifi/pcie/cfg.h
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c → ...k/drivers/net/wireless/iwlwifi/pcie/drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c → ...k/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -68,10 +68,11 @@
 #include <linux/pci-aspm.h>
 
 #include "iwl-trans.h"
-#include "iwl-cfg.h"
 #include "iwl-drv.h"
 #include "iwl-trans.h"
-#include "iwl-trans-pcie-int.h"
+
+#include "cfg.h"
+#include "internal.h"
 
 #define IWL_PCI_DEVICE(dev, subdev, cfg) \
 	.vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \

diff --git a/...net/wireless/iwlwifi/iwl-trans-pcie-int.h → ...vers/net/wireless/iwlwifi/pcie/internal.h b/...net/wireless/iwlwifi/iwl-trans-pcie-int.h → ...vers/net/wireless/iwlwifi/pcie/internal.h
diff --git a/.../net/wireless/iwlwifi/iwl-trans-pcie-rx.c → trunk/drivers/net/wireless/iwlwifi/pcie/rx.c b/.../net/wireless/iwlwifi/iwl-trans-pcie-rx.c → trunk/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -32,7 +32,7 @@
 
 #include "iwl-prph.h"
 #include "iwl-io.h"
-#include "iwl-trans-pcie-int.h"
+#include "internal.h"
 #include "iwl-op-mode.h"
 
 #ifdef CONFIG_IWLWIFI_IDI

diff --git a/...ers/net/wireless/iwlwifi/iwl-trans-pcie.c → ...drivers/net/wireless/iwlwifi/pcie/trans.c b/...ers/net/wireless/iwlwifi/iwl-trans-pcie.c → ...drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -70,11 +70,11 @@
 
 #include "iwl-drv.h"
 #include "iwl-trans.h"
-#include "iwl-trans-pcie-int.h"
 #include "iwl-csr.h"
 #include "iwl-prph.h"
 #include "iwl-eeprom.h"
 #include "iwl-agn-hw.h"
+#include "internal.h"
 /* FIXME: need to abstract out TX command (once we know what it looks like) */
 #include "iwl-commands.h"
 

diff --git a/.../net/wireless/iwlwifi/iwl-trans-pcie-tx.c → trunk/drivers/net/wireless/iwlwifi/pcie/tx.c b/.../net/wireless/iwlwifi/iwl-trans-pcie-tx.c → trunk/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -36,7 +36,7 @@
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
 #include "iwl-op-mode.h"
-#include "iwl-trans-pcie-int.h"
+#include "internal.h"
 /* FIXME: need to abstract out TX command (once we know what it looks like) */
 #include "iwl-commands.h"