From 45c79433c02b8fe7b8a1cbf60548a9798d0502ed Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sun, 23 May 2010 16:17:10 +0100
Subject: ARM: S5PC100: Fixup merge problems

Between problems with Kconfig and merging commits from several
different sources, it seems the s5pc100 build's move from plat-s5pc11
has had a few problems.

Since I do not have the trees to rebuild this quickly, the easiest
thing is to simply fix the errors found once the s5pc100_defconfig
actually builds.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
 arch/arm/mach-s5pc100/dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'arch/arm/mach-s5pc100/dma.c')

diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c
index 8e7af46bba09..0f5517571e2c 100644
--- 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>
 
-- 
cgit v1.2.2