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
/
sleep.S
diff --git
a/arch/arm/mach-s3c2410/sleep.S
b/arch/arm/mach-s3c2410/sleep.S
index
be37f22
..
dd5b638
100644
(file)
--- a/
arch/arm/mach-s3c2410/sleep.S
+++ b/
arch/arm/mach-s3c2410/sleep.S
@@
-32,7
+32,7
@@
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
#include <mach/regs-mem.h>
-#include <
asm/plat-s3c
/regs-serial.h>
+#include <
plat
/regs-serial.h>
/* s3c2410_cpu_suspend
*