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

git-mirror · Mar 11, 2009 · 2a9f0ba · 2a9f0ba
2 parents 65ec1cd + 603b6fd
commit 2a9f0ba
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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>