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

[pandora-kernel.git] / drivers / net / can / sja1000 / sja1000_of_platform.c

diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index 158b76e..ac1a83d 100644 (file)
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -38,7 +38,6 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>

-#include <linux/can.h>

 #include <linux/can/dev.h>
 
 #include <linux/of_platform.h>
 #include <linux/can/dev.h>
 
 #include <linux/of_platform.h>