summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ipw2x00/libipw_geo.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-29 01:34:14 +0300
committerIngo Molnar <mingo@elte.hu>2009-03-29 01:34:14 +0300
commit38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch)
treea83d5e4e86edf6cb2de22db6f2ff2274753a2bab /drivers/net/wireless/ipw2x00/libipw_geo.c
parentf2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff)
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
downloadlinux-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.xz
Merge branch 'linus' into core/printk
Diffstat (limited to 'drivers/net/wireless/ipw2x00/libipw_geo.c')
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_geo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_geo.c b/drivers/net/wireless/ipw2x00/libipw_geo.c
index 960ad13f5e9f..9dfbb8760f67 100644
--- a/drivers/net/wireless/ipw2x00/libipw_geo.c
+++ b/drivers/net/wireless/ipw2x00/libipw_geo.c
@@ -41,7 +41,7 @@
#include <linux/etherdevice.h>
#include <asm/uaccess.h>
-#include <net/ieee80211.h>
+#include "ieee80211.h"
int ieee80211_is_valid_channel(struct ieee80211_device *ieee, u8 channel)
{