diff --git a/[refs] b/[refs]
index 6e651a3c31d3..1e7ffa444942 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ccc3fc56e4cca6aceb81376fdb5d4c3340e72d8
+refs/heads/master: 3c093f9f182eef6a8dc535f2c62b36a0320d0db1
diff --git a/trunk/include/asm-arm/arch-iop13xx/dma.h b/trunk/include/asm-arm/arch-iop13xx/dma.h
index 2e15da53ff79..d79846fbb394 100644
--- a/trunk/include/asm-arm/arch-iop13xx/dma.h
+++ b/trunk/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 --git a/trunk/include/asm-arm/arch-msm/irqs.h b/trunk/include/asm-arm/arch-msm/irqs.h
index 565430cfaa7e..e62a108b1857 100644
--- a/trunk/include/asm-arm/arch-msm/irqs.h
+++ b/trunk/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 --git a/trunk/include/asm-arm/arch-msm/timex.h b/trunk/include/asm-arm/arch-msm/timex.h
index 154b23fb3599..8724487ab4c9 100644
--- a/trunk/include/asm-arm/arch-msm/timex.h
+++ b/trunk/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