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 master.kernel.org:/home/rmk/linux-2.6-arm
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sun3_82586.c
diff --git
a/drivers/net/sun3_82586.c
b/drivers/net/sun3_82586.c
index
2f6a760
..
8b28c89
100644
(file)
--- a/
drivers/net/sun3_82586.c
+++ b/
drivers/net/sun3_82586.c
@@
-33,7
+33,6
@@
static int fifo=0x8; /* don't change */
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/ioport.h>
-#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/init.h>