Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...

[pandora-kernel.git] / arch / arm / include / asm / hardware / pl080.h

diff --git a/arch/arm/include/asm/hardware/pl080.h b/arch/arm/include/asm/hardware/pl080.h
index e4a04e4..33c78d7 100644 (file)
--- a/arch/arm/include/asm/hardware/pl080.h
+++ b/arch/arm/include/asm/hardware/pl080.h
@@ -21,6 +21,9 @@
  * OneNAND features.
 */
 
+#ifndef ASM_PL080_H
+#define ASM_PL080_H
+
 #define PL080_INT_STATUS                       (0x00)
 #define PL080_TC_STATUS                                (0x04)
 #define PL080_TC_CLEAR                         (0x08)
@@ -138,3 +141,4 @@ struct pl080s_lli {
        u32     control1;
 };
 
+#endif /* ASM_PL080_H */