From: Vegard Nossum <vegard.nossum@gmail.com>

Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-arm/arch-iop13xx/dma.h |    2 +-
 include/asm-arm/arch-msm/irqs.h    |    1 +
 include/asm-arm/arch-msm/timex.h   |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff -puN include/asm-arm/arch-iop13xx/dma.h~arm-fix-header-guards include/asm-arm/arch-iop13xx/dma.h
--- a/include/asm-arm/arch-iop13xx/dma.h~arm-fix-header-guards
+++ a/include/asm-arm/arch-iop13xx/dma.h
@@ -1,3 +1,3 @@
 #ifndef _IOP13XX_DMA_H
-#define _IOP13XX_DMA_H_
+#define _IOP13XX_DMA_H
 #endif
diff -puN include/asm-arm/arch-msm/irqs.h~arm-fix-header-guards include/asm-arm/arch-msm/irqs.h
--- a/include/asm-arm/arch-msm/irqs.h~arm-fix-header-guards
+++ a/include/asm-arm/arch-msm/irqs.h
@@ -15,6 +15,7 @@
  */
 
 #ifndef __ASM_ARCH_MSM_IRQS_H
+#define __ASM_ARCH_MSM_IRQS_H
 
 /* MSM ARM11 Interrupt Numbers */
 /* See 80-VE113-1 A, pp219-221     */
diff -puN include/asm-arm/arch-msm/timex.h~arm-fix-header-guards include/asm-arm/arch-msm/timex.h
--- a/include/asm-arm/arch-msm/timex.h~arm-fix-header-guards
+++ a/include/asm-arm/arch-msm/timex.h
@@ -14,6 +14,7 @@
  */
 
 #ifndef __ASM_ARCH_MSM_TIMEX_H
+#define __ASM_ARCH_MSM_TIMEX_H
 
 #define CLOCK_TICK_RATE		1000000
 
_