summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-11 18:28:24 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-11 18:28:24 +0000
commit603b6fd5b8d313a109d3739d8706ee51962ff402 (patch)
treefb0e80096d0c20d2199d2bf1c761e466a2b44b91
parenta2b03461cb072eb6097a55ec0289294b09382284 (diff)
[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>
-rw-r--r--arch/arm/mach-s3c2410/include/mach/io.h2
-rw-r--r--arch/arm/plat-s3c24xx/clock-dclk.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/io.h b/arch/arm/mach-s3c2410/include/mach/io.h
index c477771c092..9813dbf2ae4 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 35219dcf9f0..5b75a797b5a 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>