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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / net / yellowfin.c

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 34c91cf..efbff76 100644 (file)
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -90,7 +90,6 @@ static int gx_fix;
 #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>