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-s3c2410
/
pm.c
diff --git
a/arch/arm/mach-s3c2410/pm.c
b/arch/arm/mach-s3c2410/pm.c
index b026cc8dcbaebee2e395e767ce9e27f8e129f1f3..a6970f6131926cdb3550e90fec3ed72a95377cc1 100644
(file)
--- a/
arch/arm/mach-s3c2410/pm.c
+++ b/
arch/arm/mach-s3c2410/pm.c
@@
-25,9
+25,9
@@
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/sysdev.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/mach-types.h>