diff --git a/[refs] b/[refs]
index db5608eb481b..96c9891817af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6dac5e1b6ea7be4b0092ae0ac96b352a8c028db
+refs/heads/master: 978da5bcdb33f6e030fa3304662e2455a018f1b0
diff --git a/trunk/arch/arm/mach-mmp/Makefile b/trunk/arch/arm/mach-mmp/Makefile
index 854f0ab322ba..d4debb39023c 100644
--- a/trunk/arch/arm/mach-mmp/Makefile
+++ b/trunk/arch/arm/mach-mmp/Makefile
@@ -2,11 +2,11 @@
 # Makefile for Marvell's PXA168 processors line
 #
 
-obj-y				+= common.o clock.o devices.o irq.o time.o
+obj-y				+= common.o clock.o devices.o time.o
 
 # SoC support
-obj-$(CONFIG_CPU_PXA168)	+= pxa168.o
-obj-$(CONFIG_CPU_PXA910)	+= pxa910.o
+obj-$(CONFIG_CPU_PXA168)	+= pxa168.o irq-pxa168.o
+obj-$(CONFIG_CPU_PXA910)	+= pxa910.o irq-pxa168.o
 
 # board support
 obj-$(CONFIG_MACH_ASPENITE)	+= aspenite.o
diff --git a/trunk/arch/arm/mach-mmp/irq.c b/trunk/arch/arm/mach-mmp/irq-pxa168.c
similarity index 100%
rename from trunk/arch/arm/mach-mmp/irq.c
rename to trunk/arch/arm/mach-mmp/irq-pxa168.c