git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fscache-fixes-20141013' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c24xx
/
mach-vr1000.c
diff --git
a/arch/arm/mach-s3c24xx/mach-vr1000.c
b/arch/arm/mach-s3c24xx/mach-vr1000.c
index f88c584c30017ab7f438b00d13be80a1b9a83979..89f32bd3f01b53e442cd963037bf18613f652e5b 100644
(file)
--- a/
arch/arm/mach-s3c24xx/mach-vr1000.c
+++ b/
arch/arm/mach-s3c24xx/mach-vr1000.c
@@
-340,5
+340,4
@@
MACHINE_START(VR1000, "Thorcom-VR1000")
.init_machine = vr1000_init,
.init_irq = s3c2410_init_irq,
.init_time = vr1000_init_time,
- .restart = s3c2410_restart,
MACHINE_END