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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-smartq5.c
diff --git
a/arch/arm/mach-s3c64xx/mach-smartq5.c
b/arch/arm/mach-s3c64xx/mach-smartq5.c
index dec4c08e834f4d5026284342568102d2a8e6a1a4..33224ab36fac8c8692ab84a7455c63f520184ada 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/
arch/arm/mach-s3c64xx/mach-smartq5.c
@@
-156,7
+156,6
@@
MACHINE_START(SMARTQ5, "SmartQ 5")
.init_irq = s3c6410_init_irq,
.map_io = smartq_map_io,
.init_machine = smartq5_machine_init,
- .init_late = s3c64xx_init_late,
.init_time = samsung_timer_init,
.restart = s3c64xx_restart,
MACHINE_END