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>
diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c
index 8e7af46..0f55175 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>