summaryrefslogtreecommitdiff
path: root/include/uapi/linux/can/bcm.h
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2014-05-15 22:31:56 +0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2014-05-19 11:38:24 +0400
commit42193e3efb632c84d686acacd7b2327f2b1f8c63 (patch)
tree64b169d00c4c2f02b61f08aeedbc1ca4a9f18f0f /include/uapi/linux/can/bcm.h
parentfd1159318e55e901cf269de90163b19fd62938cb (diff)
downloadlinux-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.xz
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/uapi/linux/can/bcm.h')
-rw-r--r--include/uapi/linux/can/bcm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/can/bcm.h b/include/uapi/linux/can/bcm.h
index 382251a1d214..89ddb9dc9bdf 100644
--- a/include/uapi/linux/can/bcm.h
+++ b/include/uapi/linux/can/bcm.h
@@ -41,8 +41,8 @@
* DAMAGE.
*/
-#ifndef CAN_BCM_H
-#define CAN_BCM_H
+#ifndef _UAPI_CAN_BCM_H
+#define _UAPI_CAN_BCM_H
#include <linux/types.h>
#include <linux/can.h>
@@ -95,4 +95,4 @@ enum {
#define TX_RESET_MULTI_IDX 0x0200
#define RX_RTR_FRAME 0x0400
-#endif /* CAN_BCM_H */
+#endif /* !_UAPI_CAN_BCM_H */