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 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-s3c24xx
/
mach-jive.c
diff --git
a/arch/arm/mach-s3c24xx/mach-jive.c
b/arch/arm/mach-s3c24xx/mach-jive.c
index 7804d3c6991b769eb68aa630bd495bbd53c7e820..7d99fe8f6157612767b667d8a2360178d4c065ab 100644
(file)
--- a/
arch/arm/mach-s3c24xx/mach-jive.c
+++ b/
arch/arm/mach-s3c24xx/mach-jive.c
@@
-670,5
+670,4
@@
MACHINE_START(JIVE, "JIVE")
.map_io = jive_map_io,
.init_machine = jive_machine_init,
.init_time = jive_init_time,
- .restart = s3c2412_restart,
MACHINE_END