include/socketcan: prepare headers to be moved to include/linux

This patch changes the include from the socketcan folder to the linux folder:

-#include <socketcan/can.h>
+#include <linux/can.h>

so that the socketcan folder can be eliminated in a later patch.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/include/socketcan/can/bcm.h b/include/socketcan/can/bcm.h
index 10185e86a59619b4dad05e24e7ab72eeba233463..f10af828e5bc879a87009d82d6b5209a1b0a3f1b 100644 (file)
--- a/include/socketcan/can/bcm.h
+++ b/include/socketcan/can/bcm.h
@@ -13,7 +13,7 @@
 #define CAN_BCM_H
 
 #include <linux/types.h>
-#include <socketcan/can.h>
+#include <linux/can.h>
 
 /**
  * struct bcm_msg_head - head of messages to/from the broadcast manager

diff --git a/include/socketcan/can/gw.h b/include/socketcan/can/gw.h
index 56d3246d73489fed10b66db8fe196a20a19b94f2..f709809c0e999eab35965cc0145f58574e8787ae 100644 (file)
--- a/include/socketcan/can/gw.h
+++ b/include/socketcan/can/gw.h
@@ -13,7 +13,7 @@
 #define CAN_GW_H
 
 #include <linux/types.h>
-#include <socketcan/can.h>
+#include <linux/can.h>
 
 struct rtcanmsg {
        __u8  can_family;

diff --git a/include/socketcan/can/isotp.h b/include/socketcan/can/isotp.h
index 541369a1ac8f296344c5d24d9d8f227c20f5ceb0..18d13d1467de415a6f659ca03b897a79775b5d32 100644 (file)
--- a/include/socketcan/can/isotp.h
+++ b/include/socketcan/can/isotp.h
@@ -46,7 +46,7 @@
 #ifndef CAN_ISOTP_H
 #define CAN_ISOTP_H
 
-#include <socketcan/can.h>
+#include <linux/can.h>
 
 #define SOL_CAN_ISOTP (SOL_CAN_BASE + CAN_ISOTP)
 

diff --git a/include/socketcan/can/raw.h b/include/socketcan/can/raw.h
index ee683c58412bd22e2a9805fd59c1246c896371b7..c80bff0e6c6057f1f52bc256ab6d3d4239f34c08 100644 (file)
--- a/include/socketcan/can/raw.h
+++ b/include/socketcan/can/raw.h
@@ -13,7 +13,7 @@
 #ifndef CAN_RAW_H
 #define CAN_RAW_H
 
-#include <socketcan/can.h>
+#include <linux/can.h>
 
 #define SOL_CAN_RAW (SOL_CAN_BASE + CAN_RAW)