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-ep93xx
/
adssphere.c
diff --git
a/arch/arm/mach-ep93xx/adssphere.c
b/arch/arm/mach-ep93xx/adssphere.c
index
19332bf
..
bda6c3a
100644
(file)
--- a/
arch/arm/mach-ep93xx/adssphere.c
+++ b/
arch/arm/mach-ep93xx/adssphere.c
@@
-38,7
+38,7
@@
MACHINE_START(ADSSPHERE, "ADS Sphere board")
.atag_offset = 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
- .
timer = &ep93xx_timer
,
+ .
init_time = ep93xx_timer_init
,
.init_machine = adssphere_init_machine,
.init_late = ep93xx_init_late,
.restart = ep93xx_restart,