Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / atp.c

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 0d730c8329d4830bdfb85ac6ed772fc46ef712e9..2bd1a5c0ec17cf0201949a4b92d4cd1535655b94 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>