aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/can/error.h
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2014-05-15 14:31:56 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2014-05-19 03:38:24 -0400
commit42193e3efb632c84d686acacd7b2327f2b1f8c63 (patch)
tree64b169d00c4c2f02b61f08aeedbc1ca4a9f18f0f /include/uapi/linux/can/error.h
parentfd1159318e55e901cf269de90163b19fd62938cb (diff)
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/error.h')
-rw-r--r--include/uapi/linux/can/error.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/can/error.h b/include/uapi/linux/can/error.h
index b63204545320..c247446ab25a 100644
--- a/include/uapi/linux/can/error.h
+++ b/include/uapi/linux/can/error.h
@@ -41,8 +41,8 @@
41 * DAMAGE. 41 * DAMAGE.
42 */ 42 */
43 43
44#ifndef CAN_ERROR_H 44#ifndef _UAPI_CAN_ERROR_H
45#define CAN_ERROR_H 45#define _UAPI_CAN_ERROR_H
46 46
47#define CAN_ERR_DLC 8 /* dlc for error message frames */ 47#define CAN_ERR_DLC 8 /* dlc for error message frames */
48 48
@@ -120,4 +120,4 @@
120 120
121/* controller specific additional information / data[5..7] */ 121/* controller specific additional information / data[5..7] */
122 122
123#endif /* CAN_ERROR_H */ 123#endif /* _UAPI_CAN_ERROR_H */