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/linux/can/dev.h | |
| parent | fd1159318e55e901cf269de90163b19fd62938cb (diff) | |
| download | linux-stable-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.gz linux-stable-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.bz2 linux-stable-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/dev.h')
| -rw-r--r-- | include/linux/can/dev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 3ce5e526525f..6992afc6ba7f 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -10,8 +10,8 @@ * */ -#ifndef CAN_DEV_H -#define CAN_DEV_H +#ifndef _CAN_DEV_H +#define _CAN_DEV_H #include <linux/can.h> #include <linux/can/netlink.h> @@ -132,4 +132,4 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, struct sk_buff *alloc_can_err_skb(struct net_device *dev, struct can_frame **cf); -#endif /* CAN_DEV_H */ +#endif /* !_CAN_DEV_H */ |