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
ARM: delete struct sys_timer
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
icontrol.c
diff --git
a/arch/arm/mach-pxa/icontrol.c
b/arch/arm/mach-pxa/icontrol.c
index 1d02eabc9c654bb18751a9b802c2f3cdbc8c83a5..fe31bfcbb8dfb6b8c3112c7fe7ce65442a178b26 100644
(file)
--- a/
arch/arm/mach-pxa/icontrol.c
+++ b/
arch/arm/mach-pxa/icontrol.c
@@
-196,7
+196,7
@@
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
.nr_irqs = PXA_NR_IRQS,
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
- .
timer = &pxa_timer
,
+ .
init_time = pxa_timer_init
,
.init_machine = icontrol_init,
.restart = pxa_restart,
MACHINE_END