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/netlink.h | |
parent | fd1159318e55e901cf269de90163b19fd62938cb (diff) | |
download | op-kernel-dev-42193e3efb632c84d686acacd7b2327f2b1f8c63.zip op-kernel-dev-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.gz |
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/netlink.h')
-rw-r--r-- | include/uapi/linux/can/netlink.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index 7e2e186..813d11f 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h @@ -15,8 +15,8 @@ * GNU General Public License for more details. */ -#ifndef CAN_NETLINK_H -#define CAN_NETLINK_H +#ifndef _UAPI_CAN_NETLINK_H +#define _UAPI_CAN_NETLINK_H #include <linux/types.h> @@ -130,4 +130,4 @@ enum { #define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1) -#endif /* CAN_NETLINK_H */ +#endif /* !_UAPI_CAN_NETLINK_H */ |