aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/can/skb.h
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2014-05-15 20:31:56 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2014-05-19 09:38:24 +0200
commit42193e3efb632c84d686acacd7b2327f2b1f8c63 (patch)
tree64b169d00c4c2f02b61f08aeedbc1ca4a9f18f0f /include/linux/can/skb.h
parentcan: add Renesas R-Car CAN driver (diff)
downloadlinux-dev-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.xz
linux-dev-42193e3efb632c84d686acacd7b2327f2b1f8c63.zip
can: unify identifiers to ensure unique include processing
Armin pointed me to the fact that the identifier which is used to ensure the unique include processing in lunux/include/uapi/linux/can.h is CAN_H. This clashed with his own source as includes from libraries and APIs should use an underscore '_' at the identifier start. This patch fixes the protection identifiers in all CAN relavant includes. Reported-by: Armin Burchardt <armin@uni-bremen.de> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'include/linux/can/skb.h')
-rw-r--r--include/linux/can/skb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
index f9bbbb472663..cc00d15c6107 100644
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
@@ -7,8 +7,8 @@
*
*/
-#ifndef CAN_SKB_H
-#define CAN_SKB_H
+#ifndef _CAN_SKB_H
+#define _CAN_SKB_H
#include <linux/types.h>
#include <linux/skbuff.h>
@@ -80,4 +80,4 @@ static inline struct sk_buff *can_create_echo_skb(struct sk_buff *skb)
return skb;
}
-#endif /* CAN_SKB_H */
+#endif /* !_CAN_SKB_H */