[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-backports
Subject:    [PATCH 01/14] header: rename duplicate include guard
From:       Hauke Mehrtens <hauke () hauke-m ! de>
Date:       2015-06-28 21:59:07
Message-ID: 1435528760-19913-2-git-send-email-hauke () hauke-m ! de
[Download RAW message or body]

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>
---
 backport/backport-include/asm/barrier.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backport/backport-include/asm/barrier.h b/backport/backport-include/asm/barrier.h
index b04bd33..3eb7372 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 */
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in
[prev in list] [next in list] [prev in thread] [next in thread]