iwlegacy: merge iwl-{eeprom,led}.h into common.h

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
git-mirror · Nov 15, 2011 · 47ef694 · 47ef694
1 parent 9941200
commit 47ef694
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 412 deletions.
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
@@ -40,9 +40,6 @@
 #include <net/mac80211.h>
 
 #include "common.h"
-#include "commands.h"
-#include "iwl-eeprom.h"
-#include "iwl-led.h"
 #include "3945.h"
 
 /* Send led command */

diff --git a/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/iwlegacy/3945.h
@@ -37,8 +37,6 @@ extern const struct pci_device_id il3945_hw_card_ids[];
 #include "common.h"
 #include "iwl-prph.h"
 #include "iwl-debug.h"
-#include "iwl-led.h"
-#include "iwl-eeprom.h"
 
 /* Highest firmware API version supported */
 #define IL3945_UCODE_API_MAX 2

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -50,7 +50,6 @@
 
 #define DRV_NAME        "iwl4965"
 
-#include "iwl-eeprom.h"
 #include "common.h"
 #include "4965.h"
 

diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
@@ -38,7 +38,6 @@
 #include <asm/unaligned.h>
 
 #include "common.h"
-#include "iwl-eeprom.h"
 #include "4965.h"
 
 #define IL_AC_UNSET -1

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
@@ -40,7 +40,6 @@
 #include <linux/skbuff.h>
 #include <net/mac80211.h>
 
-#include "iwl-eeprom.h"
 #include "iwl-debug.h"
 #include "common.h"