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 'trace-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c24xx
/
mach-nexcoder.c
diff --git
a/arch/arm/mach-s3c24xx/mach-nexcoder.c
b/arch/arm/mach-s3c24xx/mach-nexcoder.c
index c82c281ce351faa84c00d73d389e3d5fbb92811a..2a61d13dcd6cdbd6101d819bc801a9d5e75ac064 100644
(file)
--- a/
arch/arm/mach-s3c24xx/mach-nexcoder.c
+++ b/
arch/arm/mach-s3c24xx/mach-nexcoder.c
@@
-159,5
+159,4
@@
MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
.init_machine = nexcoder_init,
.init_irq = s3c2440_init_irq,
.init_time = nexcoder_init_time,
- .restart = s3c244x_restart,
MACHINE_END