merged branches/netlink in rev. 1037 back to trunk.

[socketcan-devel.git] / kernel / 2.6 / net / can / isotp.c

diff --git a/kernel/2.6/net/can/isotp.c b/kernel/2.6/net/can/isotp.c
index f35a1c4dbedcce58cf80ed266539423142f5e777..22384fcb025022a2aa497676030012e9da91a89c 100644 (file)
--- a/kernel/2.6/net/can/isotp.c
+++ b/kernel/2.6/net/can/isotp.c
@@ -61,9 +61,9 @@
 #include <linux/socket.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
-#include <linux/can.h>
-#include <linux/can/core.h>
-#include <linux/can/isotp.h>
+#include <socketcan/can.h>
+#include <socketcan/can/core.h>
+#include <socketcan/can/isotp.h>
 #include <net/sock.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
 #include <net/net_namespace.h>
@@ -72,7 +72,7 @@
 #include "compat.h"
 #endif
 
-#include <linux/can/version.h> /* for RCSID. Removed by mkpatch script */
+#include <socketcan/can/version.h> /* for RCSID. Removed by mkpatch script */
 RCSID("$Id$");
 
 #define CAN_ISOTP_VERSION CAN_VERSION