projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-s3c24xx
/
sleep-s3c2412.S
diff --git
a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
index 5adaceb7da1303c19a02b796e795aeb0aa124dd5..6bf5b4d8743c05ef52bef07d467b8bfa7062115d 100644
(file)
--- a/
arch/arm/mach-s3c24xx/sleep-s3c2412.S
+++ b/
arch/arm/mach-s3c24xx/sleep-s3c2412.S
@@
-65,4
+65,4
@@
s3c2412_sleep_enter1:
strne r9, [r3]
bne s3c2412_sleep_enter1
- mov pc, r14
+ ret lr