ARM: S5PC100: Fixup merge problems

[net-next-2.6.git] / arch / arm / mach-s5pc100 / dma.c

diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c
index 8e7af46bba09c7755287d7ee550f9ac0a914ae74..0f5517571e2c0fc2ec51dff440c83da7975a1442 100644 (file)
--- a/arch/arm/mach-s5pc100/dma.c
+++ b/arch/arm/mach-s5pc100/dma.c
@@ -21,9 +21,9 @@
 #include <linux/dma-mapping.h>
 
 #include <plat/devs.h>
-#include <plat/irqs.h>
 
 #include <mach/map.h>
+#include <mach/irqs.h>
 
 #include <plat/s3c-pl330-pdata.h>