projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c-move' into devel
[linux-2.6-block.git]
/
arch
/
arm
/
mach-s3c2412
/
pm.c
diff --git
a/arch/arm/mach-s3c2412/pm.c
b/arch/arm/mach-s3c2412/pm.c
index 4c988a44d286091fb1aaedf1ad9dafdee0376e3e..217e9e4ed45f20a9d5b0c1ce678ab752f8b4f2e5 100644
(file)
--- a/
arch/arm/mach-s3c2412/pm.c
+++ b/
arch/arm/mach-s3c2412/pm.c
@@
-18,9
+18,9
@@
#include <linux/init.h>
#include <linux/sysdev.h>
#include <linux/platform_device.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/irq.h>
#include <mach/regs-power.h>