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 'devel-stable' into devel
[pandora-kernel.git]
/
drivers
/
net
/
atp.c
diff --git
a/drivers/net/atp.c
b/drivers/net/atp.c
index
6ad1620
..
55039d4
100644
(file)
--- a/
drivers/net/atp.c
+++ b/
drivers/net/atp.c
@@
-129,7
+129,6
@@
static int xcvr[NUM_UNITS]; /* The data transfer mode. */
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/in.h>
-#include <linux/slab.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/init.h>