git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib.h
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib.h
b/drivers/infiniband/ulp/ipoib/ipoib.h
index 15867af33c440e4abd645da69268780c6a980009..87310eeb6df07eb90c6e2e61e2f4515a85c4f22b 100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/
drivers/infiniband/ulp/ipoib/ipoib.h
@@
-41,7
+41,6
@@
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/workqueue.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/workqueue.h>
-#include <linux/pci.h>
#include <linux/kref.h>
#include <linux/if_infiniband.h>
#include <linux/mutex.h>
#include <linux/kref.h>
#include <linux/if_infiniband.h>
#include <linux/mutex.h>