git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
tulip
/
uli526x.c
diff --git
a/drivers/net/tulip/uli526x.c
b/drivers/net/tulip/uli526x.c
index
7063f56
..
c7f9728
100644
(file)
--- a/
drivers/net/tulip/uli526x.c
+++ b/
drivers/net/tulip/uli526x.c
@@
-25,7
+25,6
@@
#include <linux/timer.h>
#include <linux/errno.h>
#include <linux/ioport.h>
-#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>