[PATCH] janitorial: fix all double includes in drivers/net/wireless
authorHolger Schurig <hs4233@mail.mn-solutions.de>
Thu, 11 Oct 2007 10:17:41 +0000 (12:17 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 18 Oct 2007 19:42:28 +0000 (15:42 -0400)
This patch removes all double includes of the same file. This
makes scripts/checkincludes.pl happy.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c
drivers/net/wireless/iwlwifi/iwlwifi.h

index c141a264ac45bfb16e323ee8b1bbb2b08a727666..c9b0d1aa2063061d4f5db1128eead10bc19610dc 100644 (file)
@@ -49,7 +49,6 @@
 #include "pio.h"
 #include "sysfs.h"
 #include "xmit.h"
-#include "sysfs.h"
 #include "lo.h"
 #include "pcmcia.h"
 
index f4aabcf480e46636479ebf00fc4f9d70b95f5ebf..262ab0b55824d907048d1081db1a473ad02d4852 100644 (file)
@@ -37,9 +37,6 @@
 
 #include <linux/workqueue.h>
 
-#include <net/mac80211.h>
-#include <linux/wireless.h>
-
 #define IWL 3945
 
 #include "../net/mac80211/ieee80211_rate.h"
index acb38750535f549b72fabfd0ddf2de3e1fc53e56..19bcb01e278429c83053b1dbd891a4307a668c0e 100644 (file)
@@ -38,7 +38,6 @@
 #include <net/mac80211.h>
 
 #include <linux/etherdevice.h>
-#include <linux/delay.h>
 
 #define IWL 3945
 
index 287c75705c44db0a72729dad2f0833294e5ac1ff..60caaea210765928ebf2ad55dca124dd482d9b65 100644 (file)
@@ -36,9 +36,6 @@
 
 #include <linux/workqueue.h>
 
-#include <net/mac80211.h>
-#include <linux/wireless.h>
-
 #define IWL 4965
 
 #include "../net/mac80211/ieee80211_rate.h"
index b50d20267c8a97a07679d603d17e3693458a3a9e..557deebca1b9f4a4d0cda8ec9f5488d1329bff4a 100644 (file)
@@ -35,9 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <net/mac80211.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/delay.h>
 
 #define IWL 4965
 
index 75e3b5c3f1558bce3ffc32cc99e172f6d2fa7bc4..a1d2716556be61d64aee2f348e749f727a97851e 100644 (file)
@@ -48,8 +48,6 @@
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <linux/firmware.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 
index b1a6e39f7821d9cd5888d905737d168856ada18a..7b0c602082b1fb202fe70b81cca33d5be96e0b92 100644 (file)
@@ -48,8 +48,6 @@
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <linux/firmware.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 
index e0b97c3412153fee5f6b729d506d5b9f77b8da08..432ce887807f562ed6786933d9caf751a4dfcc8f 100644 (file)
@@ -39,18 +39,13 @@ struct iwl_priv;
 /* Hardware specific file defines the PCI IDs table for that hardware module */
 extern struct pci_device_id iwl_hw_card_ids[];
 
+#include "iwl-hw.h"
 #if IWL == 3945
-
 #define DRV_NAME       "iwl3945"
-#include "iwl-hw.h"
 #include "iwl-3945-hw.h"
-
 #elif IWL == 4965
-
 #define DRV_NAME        "iwl4965"
-#include "iwl-hw.h"
 #include "iwl-4965-hw.h"
-
 #endif
 
 #include "iwl-prph.h"