3 files changed, 15 insertions, 14 deletions

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 065b702df563..1cf7ca0b6182 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -22,6 +22,7 @@
 #define IEEE80211_H
 #include <linux/if_ether.h> /* ETH_ALEN */
 #include <linux/kernel.h>   /* ARRAY_SIZE */
+#include <linux/wireless.h>
 
 #if WIRELESS_EXT < 17
 #define IW_QUAL_QUAL_INVALID   0x10
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 961c711eda97..58ed4319e693 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -2,19 +2,19 @@ config IEEE80211
         tristate "Generic IEEE 802.11 Networking Stack"
         select NET_RADIO
         ---help---
-        This option enables the hardware independent IEEE 802.11 
+        This option enables the hardware independent IEEE 802.11
         networking stack.
 
 config IEEE80211_DEBUG
         bool "Enable full debugging output"
         depends on IEEE80211
         ---help---
-          This option will enable debug tracing output for the 
-          ieee80211 network stack.  
+          This option will enable debug tracing output for the
+          ieee80211 network stack.
 
-          This will result in the kernel module being ~70k larger.  You 
-          can control which debug output is sent to the kernel log by 
-          setting the value in 
+          This will result in the kernel module being ~70k larger.  You
+          can control which debug output is sent to the kernel log by
+          setting the value in
 
           /proc/net/ieee80211/debug_level
 
@@ -22,10 +22,10 @@ config IEEE80211_DEBUG
 
           % echo 0x00000FFO > /proc/net/ieee80211/debug_level
 
-          For a list of values you can assign to debug_level, you 
+          For a list of values you can assign to debug_level, you
           can look at the bit mask values in <net/ieee80211.h>
 
-          If you are not trying to debug or develop the ieee80211 
+          If you are not trying to debug or develop the ieee80211
           subsystem, you most likely want to say N here.
 
 config IEEE80211_CRYPT_WEP
@@ -35,7 +35,7 @@ config IEEE80211_CRYPT_WEP
         select CRYPTO_ARC4
         select CRC32
         ---help---
-        Include software based cipher suites in support of IEEE 
+        Include software based cipher suites in support of IEEE
         802.11's WEP.  This is needed for WEP as well as 802.1x.
 
         This can be compiled as a modules and it will be called
@@ -47,8 +47,8 @@ config IEEE80211_CRYPT_CCMP
         select CRYPTO
         select CRYPTO_AES
         ---help---
-        Include software based cipher suites in support of IEEE 802.11i 
-        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled 
+        Include software based cipher suites in support of IEEE 802.11i
+        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled
         networks.
 
         This can be compiled as a modules and it will be called
@@ -60,8 +60,8 @@ config IEEE80211_CRYPT_TKIP
         select CRYPTO
         select CRYPTO_MICHAEL_MIC
         ---help---
-        Include software based cipher suites in support of IEEE 802.11i 
-        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled 
+        Include software based cipher suites in support of IEEE 802.11i
+        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
         networks.
 
         This can be compiled as a modules and it will be called
diff --git a/net/ieee80211/Makefile b/net/ieee80211/Makefile
index 29be9cae1def..a6ccac5baea8 100644
--- a/net/ieee80211/Makefile
+++ b/net/ieee80211/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_IEEE80211) += ieee80211.o 
+obj-$(CONFIG_IEEE80211) += ieee80211.o
 obj-$(CONFIG_IEEE80211) += ieee80211_crypt.o
 obj-$(CONFIG_IEEE80211_CRYPT_WEP) += ieee80211_crypt_wep.o
 obj-$(CONFIG_IEEE80211_CRYPT_CCMP) += ieee80211_crypt_ccmp.o