9 files changed, 24 insertions, 22 deletions
diff --git a/include/asm-arm/arch-orion/debug-macro.S b/include/asm-arm/arch-orion/debug-macro.S
index 2746220f5d8..c847f8c9250 100644
--- a/include/asm-arm/arch-orion/debug-macro.S
+++ b/include/asm-arm/arch-orion/debug-macro.S
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-orion/debug-macro.S
+ * include/asm-arm/arch-orion/debug-macro.S
  *
  * Debugging macro include header
  *
diff --git a/include/asm-arm/arch-orion/hardware.h b/include/asm-arm/arch-orion/hardware.h
index 65da374de73..998af6029c7 100644
--- a/include/asm-arm/arch-orion/hardware.h
+++ b/include/asm-arm/arch-orion/hardware.h
@@ -6,8 +6,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef __ASM_ARCH_HARDWARE_H__
-#define __ASM_ARCH_HARDWARE_H__
+#ifndef __ASM_ARCH_HARDWARE_H
+#define __ASM_ARCH_HARDWARE_H
 
 #include "orion.h"
 
diff --git a/include/asm-arm/arch-orion/io.h b/include/asm-arm/arch-orion/io.h
index 486dc04d764..23820153b61 100644
--- a/include/asm-arm/arch-orion/io.h
+++ b/include/asm-arm/arch-orion/io.h
@@ -3,13 +3,13 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
+#ifndef __ASM_ARCH_IO_H
+#define __ASM_ARCH_IO_H
 
 #include "orion.h"
 
diff --git a/include/asm-arm/arch-orion/irqs.h b/include/asm-arm/arch-orion/irqs.h
index eea65ca6076..70a2420456a 100644
--- a/include/asm-arm/arch-orion/irqs.h
+++ b/include/asm-arm/arch-orion/irqs.h
@@ -10,8 +10,8 @@
  *  warranty of any kind, whether express or implied.
  */
 
-#ifndef __ASM_ARCH_IRQS_H__
-#define __ASM_ARCH_IRQS_H__
+#ifndef __ASM_ARCH_IRQS_H
+#define __ASM_ARCH_IRQS_H
 
 #include "orion.h"	/* need GPIO_MAX */
 
@@ -58,4 +58,5 @@
 
 #define NR_IRQS			(IRQ_ORION_GPIO_START + NR_GPIO_IRQS)
 
-#endif /* __ASM_ARCH_IRQS_H__ */
+
+#endif
diff --git a/include/asm-arm/arch-orion/memory.h b/include/asm-arm/arch-orion/memory.h
index d954dba87ce..d9300d62a53 100644
--- a/include/asm-arm/arch-orion/memory.h
+++ b/include/asm-arm/arch-orion/memory.h
@@ -4,12 +4,13 @@
  * Marvell Orion memory definitions
  */
 
-#ifndef __ASM_ARCH_MMU_H
-#define __ASM_ARCH_MMU_H
+#ifndef __ASM_ARCH_MEMORY_H
+#define __ASM_ARCH_MEMORY_H
 
 #define PHYS_OFFSET	UL(0x00000000)
 
 #define __virt_to_bus(x)	__virt_to_phys(x)
 #define __bus_to_virt(x)	__phys_to_virt(x)
 
+
 #endif
diff --git a/include/asm-arm/arch-orion/orion.h b/include/asm-arm/arch-orion/orion.h
index d0b32c379ae..01f1299472d 100644
--- a/include/asm-arm/arch-orion/orion.h
+++ b/include/asm-arm/arch-orion/orion.h
@@ -11,8 +11,8 @@
  * warranty of any kind, whether express or implied.
  */
 
-#ifndef __ASM_ARCH_ORION_H__
-#define __ASM_ARCH_ORION_H__
+#ifndef __ASM_ARCH_ORION_H
+#define __ASM_ARCH_ORION_H
 
 /*****************************************************************************
  * Orion Address Maps
@@ -91,6 +91,7 @@
 
 #define ORION_BRIDGE_VIRT_BASE		(ORION_REGS_VIRT_BASE | 0x20000)
 #define ORION_BRIDGE_REG(x)		(ORION_BRIDGE_VIRT_BASE | (x))
+#define  TIMER_VIRT_BASE		(ORION_BRIDGE_VIRT_BASE | 0x300)
 
 #define ORION_PCI_VIRT_BASE		(ORION_REGS_VIRT_BASE | 0x30000)
 #define ORION_PCI_REG(x)		(ORION_PCI_VIRT_BASE | (x))
@@ -154,7 +155,5 @@
 #define MAIN_IRQ_CAUSE		ORION_BRIDGE_REG(0x200)
 #define MAIN_IRQ_MASK		ORION_BRIDGE_REG(0x204)
 
-#define TIMER_VIRT_BASE		(ORION_BRIDGE_VIRT_BASE | 0x300)
-
 
 #endif
diff --git a/include/asm-arm/arch-orion/system.h b/include/asm-arm/arch-orion/system.h
index 17704c68f90..653f992bbe6 100644
--- a/include/asm-arm/arch-orion/system.h
+++ b/include/asm-arm/arch-orion/system.h
@@ -3,8 +3,8 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
@@ -28,4 +28,5 @@ static inline void arch_reset(char mode)
 	orion_setbits(CPU_SOFT_RESET, 1);
 }
 
+
 #endif
diff --git a/include/asm-arm/arch-orion/timex.h b/include/asm-arm/arch-orion/timex.h
index cc0fc7075eb..85588d9c22e 100644
--- a/include/asm-arm/arch-orion/timex.h
+++ b/include/asm-arm/arch-orion/timex.h
@@ -3,8 +3,8 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
diff --git a/include/asm-arm/arch-orion/uncompress.h b/include/asm-arm/arch-orion/uncompress.h
index 59f44039909..03306cdd51b 100644
--- a/include/asm-arm/arch-orion/uncompress.h
+++ b/include/asm-arm/arch-orion/uncompress.h
@@ -3,8 +3,8 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */