summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-06-26 23:38:57 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2015-06-30 23:38:29 +0200
commit255df4b9157913ab631952aeda4bb86cef64307c (patch)
treefba913897007b2461994c998fd2eac9c6020ee55
parent8ccb0e28b9782d9f1cd515e8ed7f8067b4267010 (diff)
header: rename duplicate include guard
Upstream commit: d317acb9f617222ab9ba1ecca817989d06f0d90a The same include guard is also used in backport/backport-include /asm-generic/barrier.h which prevents both files from being included at the same time. Reported-by: Martin Tippmann <martin.tippmann@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--backport/backport-include/asm/barrier.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/backport/backport-include/asm/barrier.h b/backport/backport-include/asm/barrier.h
index b04bd332..3eb7372c 100644
--- a/backport/backport-include/asm/barrier.h
+++ b/backport/backport-include/asm/barrier.h
@@ -1,9 +1,9 @@
-#ifndef __BACKPORT_ASM_GENERIC_BARRIER_H
-#define __BACKPORT_ASM_GENERIC_BARRIER_H
+#ifndef __BACKPORT_ASM_BARRIER_H
+#define __BACKPORT_ASM_BARRIER_H
#include_next <asm/barrier.h>
#ifndef dma_rmb
#define dma_rmb() rmb()
#endif
-#endif /* __BACKPORT_ASM_GENERIC_BARRIER_H */
+#endif /* __BACKPORT_ASM_BARRIER_H */