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 master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
tulip
/
pnic.c
diff --git
a/drivers/net/tulip/pnic.c
b/drivers/net/tulip/pnic.c
index 85a521e0d0526c0f879dff6346cea79984480631..be82a2effee3f69383bbe6153b398aea55cf762a 100644
(file)
--- a/
drivers/net/tulip/pnic.c
+++ b/
drivers/net/tulip/pnic.c
@@
-15,7
+15,6
@@
*/
#include <linux/kernel.h>
-#include <linux/pci.h>
#include <linux/jiffies.h>
#include "tulip.h"