Fix some #includes in CAN drivers (rebased for net-next-2.6)
authorHans J. Koch <hjk@linutronix.de>
Tue, 13 Apr 2010 00:03:25 +0000 (00:03 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 10:32:42 +0000 (03:32 -0700)
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>
14 files changed:
drivers/net/can/at91_can.c
drivers/net/can/bfin_can.c
drivers/net/can/mcp251x.c
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/can/mscan/mscan.c
drivers/net/can/sja1000/ems_pci.c
drivers/net/can/sja1000/kvaser_pci.c
drivers/net/can/sja1000/plx_pci.c
drivers/net/can/sja1000/sja1000.c
drivers/net/can/sja1000/sja1000_isa.c
drivers/net/can/sja1000/sja1000_of_platform.c
drivers/net/can/sja1000/sja1000_platform.c
drivers/net/can/ti_hecc.c
include/linux/can/dev.h

index a2f29a38798a4de2fe9ae631749afa81279ce449..3f7ceaebd687a626937e4aaa89e35632aa4682c2 100644 (file)
@@ -35,7 +35,6 @@
 #include <linux/string.h>
 #include <linux/types.h>
 
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 
index 03489864376df7ca060927c3afd3d058b41e088b..d77264ad326d041d083a09dbe8664f903073f6f7 100644 (file)
@@ -18,7 +18,6 @@
 #include <linux/skbuff.h>
 #include <linux/platform_device.h>
 
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 
index eb898515352c98525bb08cf6964bdfd4fbdbc167..8431eb08075d84d0778dbb378b3db4ffec879767 100644 (file)
@@ -58,7 +58,6 @@
  *
  */
 
-#include <linux/can.h>
 #include <linux/can/core.h>
 #include <linux/can/dev.h>
 #include <linux/can/platform/mcp251x.h>
index 03e7c48465a212bd8b5ca17f248ff27e2f58051f..225fd147774aa1f8c37ea452f46d1e558a317316 100644 (file)
@@ -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>
index 6b7dd578d417b55c65e5eeb47439b5c604e76500..64c378cd0c34125471f6cb3fcae10482ae1e0656 100644 (file)
@@ -28,7 +28,6 @@
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/list.h>
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 #include <linux/io.h>
index 5f53da0bc40ceddc2ce58c8949b536f789b1b15d..36f4f9780c300c3952e5889e960de3ddb75e8b45 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/io.h>
 
index 441e776a7f59f51cedb91671e83f80e66436bde9..ed004cebd31f0dc46b79f34c41893d279d5e41a2 100644 (file)
@@ -36,7 +36,6 @@
 #include <linux/netdevice.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/io.h>
 
index d5efd68085fd656da1b3ac55b1ae6d63bc52e21e..437b5c716a2426aeac6157808b0539976db0515a 100644 (file)
@@ -27,7 +27,6 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/io.h>
 
index 145b1a731a53aa99f9c8c902df96bf8453c59796..618c11222abc1537466e6f62c9d41036da7d721b 100644 (file)
@@ -60,7 +60,6 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 
index a6a51f1559628db67181dea7c1bc0cba2355b50d..496223e9e2fc469d14dffee5bd584951239cabe1 100644 (file)
@@ -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>
 
index 9dd076a626a5b329b1ff368f3682daabe516acd9..34e79efbd2fca7413924a8e47abde8b47baa82bb 100644 (file)
@@ -38,7 +38,6 @@
 #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>
index 1083b42ab6cb6bbe50f67543ee6a8340b26c9f16..b65cabb361ab8ce07bc8a45a5da2000f12b4d654 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/platform/sja1000.h>
 #include <linux/io.h>
index 0c3d2ba0d1789cf665f590868dd0ab8af8dc7e99..4d07f1ee7168acd8e736b08b63c4a455e0e56bc8 100644 (file)
@@ -47,7 +47,6 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 #include <linux/can/platform/ti_hecc.h>
index 6e5a7f00223d28afc366d189fa2e9df1ad261cf1..cc0bb4961669a94a6abc15c81909b6c6d230fb8d 100644 (file)
@@ -14,6 +14,7 @@
 #ifndef CAN_DEV_H
 #define CAN_DEV_H
 
+#include <linux/can.h>
 #include <linux/can/netlink.h>
 #include <linux/can/error.h>