From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 11 Mar 2009 18:28:24 +0000 (+0000)
Subject: [ARM] Revert futher extraneous changes from the S3C header move
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=603b6fd5b8d313a109d3739d8706ee51962ff402;p=linux-beck.git

[ARM] Revert futher extraneous changes from the S3C header move

Can't see any immediate need for these; build tested.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/arch/arm/mach-s3c2410/include/mach/io.h b/arch/arm/mach-s3c2410/include/mach/io.h
index c477771c0924..9813dbf2ae4f 100644
--- a/arch/arm/mach-s3c2410/include/mach/io.h
+++ b/arch/arm/mach-s3c2410/include/mach/io.h
@@ -9,7 +9,7 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#include <mach/map.h>
+#include <mach/hardware.h>
 
 #define IO_SPACE_LIMIT 0xffffffff
 
diff --git a/arch/arm/plat-s3c24xx/clock-dclk.c b/arch/arm/plat-s3c24xx/clock-dclk.c
index 35219dcf9f08..5b75a797b5ab 100644
--- a/arch/arm/plat-s3c24xx/clock-dclk.c
+++ b/arch/arm/plat-s3c24xx/clock-dclk.c
@@ -18,7 +18,6 @@
 
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
-#include <mach/hardware.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>