Merge tag 'for-3.14' of git://openrisc.net/~jonas/linux

[~andy/linux] / drivers / staging / octeon / ethernet-rx.c

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 0315f60497b7fcacc48ca876bb862febed85c759..a0f4868cfa13aa954625c4cef264b1d935fa67e2 100644 (file)
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -29,7 +29,6 @@
 #include <linux/cache.h>
 #include <linux/cpumask.h>
 #include <linux/netdevice.h>
-#include <linux/init.h>
 #include <linux/etherdevice.h>
 #include <linux/ip.h>
 #include <linux/string.h>