Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 829e0015 authored by Hans J. Koch's avatar Hans J. Koch Committed by David S. Miller
Browse files

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: default avatarHans J. Koch <hjk@linutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e10d4a7

drivers/net/can/at91_can.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/can/bfin_can.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/can/mcp251x.c

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
 *

 */



#include <linux/can.h>

#include <linux/can/core.h>

#include <linux/can/dev.h>

#include <linux/can/platform/mcp251x.h>

drivers/net/can/mscan/mpc5xxx_can.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/can/mscan/mscan.c

+0 −1
Original line number Diff line number Diff line
@@ -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>