diff --git a/[refs] b/[refs]
index 7ce60f944fac..7242e207fdd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17453dd2e7df20612770ebbf1ab5d506a432210c
+refs/heads/master: 8a407835bef6d47dcef9594d8c85900f994fbedf
diff --git a/trunk/arch/arm/mach-s3c24xx/Makefile b/trunk/arch/arm/mach-s3c24xx/Makefile
index be6e4d0e6f1a..6f46ecfc8396 100644
--- a/trunk/arch/arm/mach-s3c24xx/Makefile
+++ b/trunk/arch/arm/mach-s3c24xx/Makefile
@@ -14,7 +14,7 @@ obj-				:=
 
 # core
 
-obj-y				+= common.o irq.o
+obj-y				+= common.o
 
 obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o
 obj-$(CONFIG_S3C2410_CPUFREQ)	+= cpufreq-s3c2410.o
diff --git a/trunk/drivers/irqchip/Makefile b/trunk/drivers/irqchip/Makefile
index 98e3b87bdf1b..4d65a21eb9b8 100644
--- a/trunk/drivers/irqchip/Makefile
+++ b/trunk/drivers/irqchip/Makefile
@@ -2,6 +2,7 @@ obj-$(CONFIG_IRQCHIP)			+= irqchip.o
 
 obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o
 obj-$(CONFIG_ARCH_EXYNOS)		+= exynos-combiner.o
+obj-$(CONFIG_ARCH_S3C24XX)		+= irq-s3c24xx.o
 obj-$(CONFIG_METAG)			+= irq-metag-ext.o
 obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)	+= irq-metag.o
 obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi.o
diff --git a/trunk/arch/arm/mach-s3c24xx/irq.c b/trunk/drivers/irqchip/irq-s3c24xx.c
similarity index 100%
rename from trunk/arch/arm/mach-s3c24xx/irq.c
rename to trunk/drivers/irqchip/irq-s3c24xx.c