Merge remote branch 'origin' into secretlab/next-devicetree

[linux-imx.git] / drivers / net / can / mscan / mpc5xxx_can.c

diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 2120784f8db4574a7613521bffa97c86cea38233..8af8442c694a69c2e4e5dea49ebcd7d13a4e92de 100644 (file)
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -25,7 +25,6 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/netdevice.h>
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/of_platform.h>
 #include <sysdev/fsl_soc.h>