diff options
| author |   Oliver Hartkopp <socketcan@hartkopp.net> | 2014-05-15 20:31:56 +0200 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2014-05-19 09:38:24 +0200 |
| commit | 42193e3efb632c84d686acacd7b2327f2b1f8c63 (patch) | |
| tree | 64b169d00c4c2f02b61f08aeedbc1ca4a9f18f0f /include/uapi/linux/can/error.h | |
| parent | can: add Renesas R-Car CAN driver (diff) | |
| download | linux-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/uapi/linux/can/error.h')
| -rw-r--r-- | include/uapi/linux/can/error.h | 6 |
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 @@ * DAMAGE. */ -#ifndef CAN_ERROR_H -#define CAN_ERROR_H +#ifndef _UAPI_CAN_ERROR_H +#define _UAPI_CAN_ERROR_H #define CAN_ERR_DLC 8 /* dlc for error message frames */ @@ -120,4 +120,4 @@ /* controller specific additional information / data[5..7] */ -#endif /* CAN_ERROR_H */ +#endif /* _UAPI_CAN_ERROR_H */ |