git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
include
/
mach
/
system-reset.h
diff --git
a/arch/arm/mach-s3c2410/include/mach/system-reset.h
b/arch/arm/mach-s3c2410/include/mach/system-reset.h
index
ec2defe
..
43535a0
100644
(file)
--- a/
arch/arm/mach-s3c2410/include/mach/system-reset.h
+++ b/
arch/arm/mach-s3c2410/include/mach/system-reset.h
@@
-11,7
+11,7
@@
*/
#include <mach/hardware.h>
*/
#include <mach/hardware.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <asm/plat-s3c/regs-watchdog.h>
#include <mach/regs-clock.h>
#include <asm/plat-s3c/regs-watchdog.h>
#include <mach/regs-clock.h>