projects
/
cascardo
/
linux.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
[cascardo/linux.git]
/
arch
/
arm
/
plat-s3c24xx
/
pm-simtec.c
diff --git
a/arch/arm/plat-s3c24xx/pm-simtec.c
b/arch/arm/plat-s3c24xx/pm-simtec.c
index
ef60297
..
21dfa74
100644
(file)
--- a/
arch/arm/plat-s3c24xx/pm-simtec.c
+++ b/
arch/arm/plat-s3c24xx/pm-simtec.c
@@
-20,12
+20,12
@@
#include <linux/init.h>
#include <linux/sysdev.h>
#include <linux/device.h>
+#include <linux/io.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>