Merge branch 's3c-iis-header' into for-2.6.30

2a9f0ba7 · Mark Brown · 65ec1cd1 · 603b6fd5 · 2a9f0ba7 · 2a9f0ba7
Commit 2a9f0ba7 authored Mar 11, 2009 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

arch/arm/mach-s3c2410/include/mach/io.h arch/arm/mach-s3c2410/include/mach/io.h +1 -1

arch/arm/plat-s3c24xx/clock-dclk.c arch/arm/plat-s3c24xx/clock-dclk.c +0 -1

No files found.
--- 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

--- 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>