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]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib.h
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib.h
b/drivers/infiniband/ulp/ipoib/ipoib.h
index
7b6985a
..
b3cc1e0
100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/
drivers/infiniband/ulp/ipoib/ipoib.h
@@
-45,7
+45,7
@@
#include <net/neighbour.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <rdma/ib_verbs.h>
#include <rdma/ib_pack.h>