summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/sja1000/sja1000_isa.c
diff options
context:
space:
mode:
authorHans J. Koch <hjk@linutronix.de>2010-04-13 00:03:25 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-13 03:32:42 -0700
commit829e0015431537176e38812f88fffe1d3250083e (patch)
tree585fa8fafbf09d629262f78c3b7ab2f578f35021 /drivers/net/can/sja1000/sja1000_isa.c
parent5e10d4a7fc80e4ef310c07a6a547406fef50534a (diff)
downloadblackbird-obmc-linux-829e0015431537176e38812f88fffe1d3250083e.tar.gz
blackbird-obmc-linux-829e0015431537176e38812f88fffe1d3250083e.zip
Fix some #includes in CAN drivers (rebased for net-next-2.6)
In the current implementation, CAN drivers need to #include <linux/can.h> _before_ they #include <linux/can/dev.h>, which is both ugly and unnecessary. Fix this by including <linux/can.h> in <linux/can/dev.h> and remove the #include <linux/can.h> lines from drivers. Signed-off-by: Hans J. Koch <hjk@linutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/sja1000/sja1000_isa.c')
-rw-r--r--drivers/net/can/sja1000/sja1000_isa.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c
index a6a51f155962..496223e9e2fc 100644
--- a/drivers/net/can/sja1000/sja1000_isa.c
+++ b/drivers/net/can/sja1000/sja1000_isa.c
@@ -23,7 +23,6 @@
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/io.h>
-#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/platform/sja1000.h>
OpenPOWER on IntegriCloud