diff --git a/[refs] b/[refs]
index 7cf01c8b6ebb..51ff6e71ec16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da14d88e90d476b315e5e9c3e3ffa940cb670c6d
+refs/heads/master: b590bc5cd0ced1019f02ca7c9b8594482304987f
diff --git a/trunk/arch/arm/mach-orion/addr-map.c b/trunk/arch/arm/mach-orion/addr-map.c
index ca641db6214d..ecca987b57e9 100644
--- a/trunk/arch/arm/mach-orion/addr-map.c
+++ b/trunk/arch/arm/mach-orion/addr-map.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/mbus.h>
 #include <asm/hardware.h>
+#include <asm/io.h>
 #include "common.h"
 
 /*
diff --git a/trunk/arch/arm/mach-orion/gpio.c b/trunk/arch/arm/mach-orion/gpio.c
index f713818c66a3..5a7d9cc9b800 100644
--- a/trunk/arch/arm/mach-orion/gpio.c
+++ b/trunk/arch/arm/mach-orion/gpio.c
@@ -16,6 +16,7 @@
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 #include <asm/gpio.h>
+#include <asm/io.h>
 #include <asm/arch/orion.h>
 #include "common.h"
 
diff --git a/trunk/arch/arm/mach-orion/irq.c b/trunk/arch/arm/mach-orion/irq.c
index 855793afcca8..dc8cb15a817f 100644
--- a/trunk/arch/arm/mach-orion/irq.c
+++ b/trunk/arch/arm/mach-orion/irq.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/gpio.h>
+#include <asm/io.h>
 #include <asm/arch/orion.h>
 #include <asm/plat-orion/irq.h>
 #include "common.h"
diff --git a/trunk/include/asm-arm/arch-orion/io.h b/trunk/include/asm-arm/arch-orion/io.h
index e0b8c39b9167..42abd297ae5f 100644
--- a/trunk/include/asm-arm/arch-orion/io.h
+++ b/trunk/include/asm-arm/arch-orion/io.h
@@ -24,4 +24,19 @@ static inline void __iomem *__io(unsigned long addr)
 #define __io(a)			__io(a)
 #define __mem_pci(a)		(a)
 
+
+/*****************************************************************************
+ * Helpers to access Orion registers
+ ****************************************************************************/
+#define orion_read(r)		__raw_readl(r)
+#define orion_write(r, val)	__raw_writel(val, r)
+
+/*
+ * These are not preempt-safe.  Locks, if needed, must be taken
+ * care of by the caller.
+ */
+#define orion_setbits(r, mask)	orion_write((r), orion_read(r) | (mask))
+#define orion_clrbits(r, mask)	orion_write((r), orion_read(r) & ~(mask))
+
+
 #endif
diff --git a/trunk/include/asm-arm/arch-orion/orion.h b/trunk/include/asm-arm/arch-orion/orion.h
index 95f67081bb9c..d0b32c379ae4 100644
--- a/trunk/include/asm-arm/arch-orion/orion.h
+++ b/trunk/include/asm-arm/arch-orion/orion.h
@@ -156,23 +156,5 @@
 
 #define TIMER_VIRT_BASE		(ORION_BRIDGE_VIRT_BASE | 0x300)
 
-#ifndef __ASSEMBLY__
 
-/*******************************************************************************
- * Helpers to access Orion registers
- ******************************************************************************/
-#include <asm/types.h>
-#include <asm/io.h>
-
-#define orion_read(r)		__raw_readl(r)
-#define orion_write(r, val)	__raw_writel(val, r)
-
-/*
- * These are not preempt safe. Locks, if needed, must be taken care by caller.
- */
-#define orion_setbits(r, mask)	orion_write((r), orion_read(r) | (mask))
-#define orion_clrbits(r, mask)	orion_write((r), orion_read(r) & ~(mask))
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_ARCH_ORION_H__ */
+#endif