From 9ec0ca34bf7df9f7a0ba80ccd2093a9336d75e11 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 6 Mar 2012 13:31:06 -0800
Subject: [PATCH] --- yaml --- r: 291267 b: refs/heads/master c:
 eae63b858f9a238a8868846dc5f27fc5e1865659 h: refs/heads/master i:   291265:
 5b465a6271b384a2c974458637be0e937120a9df   291263:
 a01e6fee0ec07490ca409f6ae54caf32b4dcb7bc v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-1000.c     | 1 +
 trunk/drivers/net/wireless/iwlwifi/iwl-5000.c     | 1 +
 trunk/drivers/net/wireless/iwlwifi/iwl-dev.h      | 2 --
 trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c   | 1 +
 trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c | 1 +
 6 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7f2f4240f254..82e9fee12e6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55bba9eafbaa1d63df8158967fbe69c1a4aa71b1
+refs/heads/master: eae63b858f9a238a8868846dc5f27fc5e1865659
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-1000.c b/trunk/drivers/net/wireless/iwlwifi/iwl-1000.c
index 5abebc355f7f..f6e6f57aade5 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -43,6 +43,7 @@
 #include "iwl-agn-hw.h"
 #include "iwl-shared.h"
 #include "iwl-cfg.h"
+#include "iwl-prph.h"
 
 /* Highest firmware API version supported */
 #define IWL1000_UCODE_API_MAX 6
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c b/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c
index 821ed3a36e52..907a0b22f7b2 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -45,6 +45,7 @@
 #include "iwl-trans.h"
 #include "iwl-shared.h"
 #include "iwl-cfg.h"
+#include "iwl-prph.h"
 
 /* Highest firmware API version supported */
 #define IWL5000_UCODE_API_MAX 5
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h
index a301daf18fbc..d1e722bd9f5b 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -37,11 +37,9 @@
 #include <linux/leds.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#include <net/ieee80211_radiotap.h>
 
 #include "iwl-eeprom.h"
 #include "iwl-csr.h"
-#include "iwl-prph.h"
 #include "iwl-debug.h"
 #include "iwl-agn-hw.h"
 #include "iwl-led.h"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index f965ee333920..e2d80849001f 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -75,6 +75,7 @@
 #include "iwl-agn.h"
 #include "iwl-eeprom.h"
 #include "iwl-io.h"
+#include "iwl-prph.h"
 
 /************************** EEPROM BANDS ****************************
  *
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c
index 63868df32263..5b06916be610 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -78,6 +78,7 @@
 #include "iwl-testmode.h"
 #include "iwl-trans.h"
 #include "iwl-fh.h"
+#include "iwl-prph.h"
 
 
 /* Periphery registers absolute lower bound. This is used in order to