Update CAN gateway to compile with mainline

[lisovros/linux_canprio.git] / net / can / gw.c

diff --git a/net/can/gw.c b/net/can/gw.c
index 74d51f5cb5e1f88b4700b9984d3a9eb979d51aae..c223b6d4ecc6a413a4c4442c71fdc3436d01a282 100644 (file)
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -53,15 +53,12 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
-#include <socketcan/can.h>
-#include <socketcan/can/core.h>
+#include <linux/can.h>
+#include <linux/can/core.h>
 #include <socketcan/can/gw.h>
 #include <net/rtnetlink.h>
 #include <net/net_namespace.h>
 
-#include <socketcan/can/version.h> /* for RCSID. Removed by mkpatch script */
-RCSID("$Id$");
-
 #define CAN_GW_VERSION "20100412"
 static __initdata const char banner[] =
        KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";