git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
include
/
net
/
lib80211.h
diff --git
a/include/net/lib80211.h
b/include/net/lib80211.h
index
848cce1
..
b95bbb0
100644
(file)
--- a/
include/net/lib80211.h
+++ b/
include/net/lib80211.h
@@
-26,7
+26,7
@@
#include <linux/types.h>
#include <linux/list.h>
#include <linux/module.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <linux/if.h>
#include <linux/skbuff.h>
#include <linux/ieee80211.h>