aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-11 18:30:48 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-11 18:30:48 +0000
commit2a9f0ba7a976bc2b1bcf9156c1e57ffbc8f8fb64 (patch)
treedf2d0a550c8bb0750b091c8a30d5d21cc684507c
parent65ec1cd1e2c6228752d2f167b01e6d291014d249 (diff)
parent603b6fd5b8d313a109d3739d8706ee51962ff402 (diff)
Merge branch 's3c-iis-header' into for-2.6.30
-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>