Merge branch 's3c-move' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / plat-s3c24xx / pm.c

diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
index d937ff1a9ac5476f21eb66bf7e17ed6ab624b30d..8efb57ad501948974b0400c3f5ed75910506575d 100644 (file)
--- a/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@ -35,10 +35,10 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/serial_core.h>
+#include <linux/io.h>
 
 #include <asm/cacheflush.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 
 #include <plat/regs-serial.h>
 #include <mach/regs-clock.h>