sugar/linux
1
0
Fork 0
Code Activity

Fix some #includes in CAN drivers (rebased for net-next-2.6)

Browse Source 
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>
This commit is contained in:
Hans J. Koch
2010-04-13 00:03:25 +00:00
committed by David S. Miller
parent 5e10d4a7fc
commit 829e001543
14 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/can/at91_can.c
View File

@@ -35,7 +35,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/error.h> #include <linux/can/error.h>

1
drivers/net/can/bfin_can.c
View File

@@ -18,7 +18,6 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/error.h> #include <linux/can/error.h>

1
drivers/net/can/mcp251x.c
View File

@@ -58,7 +58,6 @@
* *
*/ */
#include <linux/can.h>
#include <linux/can/core.h> #include <linux/can/core.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/platform/mcp251x.h> #include <linux/can/platform/mcp251x.h>

1
drivers/net/can/mscan/mpc5xxx_can.c
View File

@@ -25,7 +25,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <sysdev/fsl_soc.h> #include <sysdev/fsl_soc.h>

1
drivers/net/can/mscan/mscan.c
View File

@@ -28,7 +28,6 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/error.h> #include <linux/can/error.h>
#include <linux/io.h> #include <linux/io.h>

1
drivers/net/can/sja1000/ems_pci.c
View File

@@ -24,7 +24,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/io.h> #include <linux/io.h>

1
drivers/net/can/sja1000/kvaser_pci.c
View File

@@ -36,7 +36,6 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/io.h> #include <linux/io.h>

1
drivers/net/can/sja1000/plx_pci.c
View File

@@ -27,7 +27,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/io.h> #include <linux/io.h>

1
drivers/net/can/sja1000/sja1000.c
View File

@@ -60,7 +60,6 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/error.h> #include <linux/can/error.h>

1
drivers/net/can/sja1000/sja1000_isa.c
View File

@@ -23,7 +23,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/platform/sja1000.h> #include <linux/can/platform/sja1000.h>

1
drivers/net/can/sja1000/sja1000_of_platform.c
View File

@@ -38,7 +38,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>

1
drivers/net/can/sja1000/sja1000_platform.c
View File

@@ -24,7 +24,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/platform/sja1000.h> #include <linux/can/platform/sja1000.h>
#include <linux/io.h> #include <linux/io.h>

1
drivers/net/can/ti_hecc.c
View File

@@ -47,7 +47,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/can.h>
#include <linux/can/dev.h> #include <linux/can/dev.h>
#include <linux/can/error.h> #include <linux/can/error.h>
#include <linux/can/platform/ti_hecc.h> #include <linux/can/platform/ti_hecc.h>

1
include/linux/can/dev.h
View File

@@ -14,6 +14,7 @@
#ifndef CAN_DEV_H #ifndef CAN_DEV_H
#define CAN_DEV_H #define CAN_DEV_H
#include <linux/can.h>
#include <linux/can/netlink.h> #include <linux/can/netlink.h>
#include <linux/can/error.h> #include <linux/can/error.h>