git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-smartq7.c
diff --git
a/arch/arm/mach-s3c64xx/mach-smartq7.c
b/arch/arm/mach-s3c64xx/mach-smartq7.c
index
9077b85
..
37bb0c6
100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/
arch/arm/mach-s3c64xx/mach-smartq7.c
@@
-171,6
+171,6
@@
MACHINE_START(SMARTQ7, "SmartQ 7")
.map_io = smartq_map_io,
.init_machine = smartq7_machine_init,
.init_late = s3c64xx_init_late,
- .
timer = &s3c24xx_timer
,
+ .
init_time = s3c24xx_timer_init
,
.restart = s3c64xx_restart,
MACHINE_END