summaryrefslogtreecommitdiffstats
path: root/include/linux/can/platform/sja1000.h
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2014-05-15 20:31:56 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2014-05-19 09:38:24 +0200
commit42193e3efb632c84d686acacd7b2327f2b1f8c63 (patch)
tree64b169d00c4c2f02b61f08aeedbc1ca4a9f18f0f /include/linux/can/platform/sja1000.h
parentfd1159318e55e901cf269de90163b19fd62938cb (diff)
downloadlinux-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.gz
linux-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.bz2
linux-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/platform/sja1000.h')
-rw-r--r--include/linux/can/platform/sja1000.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/can/platform/sja1000.h b/include/linux/can/platform/sja1000.h
index 96f8fcc78d78..93570b61ec6c 100644
--- a/include/linux/can/platform/sja1000.h
+++ b/include/linux/can/platform/sja1000.h
@@ -1,5 +1,5 @@
-#ifndef _CAN_PLATFORM_SJA1000_H_
-#define _CAN_PLATFORM_SJA1000_H_
+#ifndef _CAN_PLATFORM_SJA1000_H
+#define _CAN_PLATFORM_SJA1000_H
/* clock divider register */
#define CDR_CLKOUT_MASK 0x07
@@ -32,4 +32,4 @@ struct sja1000_platform_data {
u8 cdr; /* clock divider register */
};
-#endif /* !_CAN_PLATFORM_SJA1000_H_ */
+#endif /* !_CAN_PLATFORM_SJA1000_H */