diff --git a/[refs] b/[refs]
index 164b53eacfec..482ee1d2debb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd18c34eac6686d04aed9e51e7b98842c0cef3d5
+refs/heads/master: 18ec5c731271939acb414614e964c15c8ef52156
diff --git a/trunk/arch/arm/common/Makefile b/trunk/arch/arm/common/Makefile
index c81a2ff6b5be..847e3e6356c6 100644
--- a/trunk/arch/arm/common/Makefile
+++ b/trunk/arch/arm/common/Makefile
@@ -15,3 +15,4 @@ obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o
 obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o
 obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o
 obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o
+obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o
diff --git a/trunk/arch/arm/mach-ixp2000/uengine.c b/trunk/arch/arm/common/uengine.c
similarity index 99%
rename from trunk/arch/arm/mach-ixp2000/uengine.c
rename to trunk/arch/arm/common/uengine.c
index ec4e007a22ef..a1310b71004e 100644
--- a/trunk/arch/arm/mach-ixp2000/uengine.c
+++ b/trunk/arch/arm/common/uengine.c
@@ -19,7 +19,7 @@
 #include <linux/string.h>
 #include <asm/hardware.h>
 #include <asm/arch/ixp2000-regs.h>
-#include <asm/arch/uengine.h>
+#include <asm/hardware/uengine.h>
 #include <asm/io.h>
 
 #define USTORE_ADDRESS			0x000
diff --git a/trunk/arch/arm/mach-ixp2000/Makefile b/trunk/arch/arm/mach-ixp2000/Makefile
index 9621aeb61f46..1e6139d42a92 100644
--- a/trunk/arch/arm/mach-ixp2000/Makefile
+++ b/trunk/arch/arm/mach-ixp2000/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the linux kernel.
 #
-obj-y			:= core.o pci.o uengine.o
+obj-y			:= core.o pci.o
 obj-m			:=
 obj-n			:=
 obj-			:=
diff --git a/trunk/drivers/net/ixp2000/enp2611.c b/trunk/drivers/net/ixp2000/enp2611.c
index d82651a97bae..6f7dce8eba51 100644
--- a/trunk/drivers/net/ixp2000/enp2611.c
+++ b/trunk/drivers/net/ixp2000/enp2611.c
@@ -16,7 +16,7 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
-#include <asm/arch/uengine.h>
+#include <asm/hardware/uengine.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include "ixpdev.h"
diff --git a/trunk/drivers/net/ixp2000/ixpdev.c b/trunk/drivers/net/ixp2000/ixpdev.c
index 09f03f493bea..77f104a005f3 100644
--- a/trunk/drivers/net/ixp2000/ixpdev.c
+++ b/trunk/drivers/net/ixp2000/ixpdev.c
@@ -16,7 +16,7 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
-#include <asm/arch/uengine.h>
+#include <asm/hardware/uengine.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include "ixp2400_rx.ucode"
diff --git a/trunk/include/asm-arm/arch-ixp2000/uengine.h b/trunk/include/asm-arm/hardware/uengine.h
similarity index 100%
rename from trunk/include/asm-arm/arch-ixp2000/uengine.h
rename to trunk/include/asm-arm/hardware/uengine.h