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 'timer/cleanup' into late/mvebu2
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
pcm027.c
diff --git
a/arch/arm/mach-pxa/pcm027.c
b/arch/arm/mach-pxa/pcm027.c
index fe9054435b6f214c63b700fe61967d0ec2d32987..69918c7e3f1fa6eaf8963e2c71d597d6e01021af 100644
(file)
--- a/
arch/arm/mach-pxa/pcm027.c
+++ b/
arch/arm/mach-pxa/pcm027.c
@@
-263,7
+263,7
@@
MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270")
.nr_irqs = PCM027_NR_IRQS,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
- .
timer = &pxa_timer
,
+ .
init_time = pxa_timer_init
,
.init_machine = pcm027_init,
.restart = pxa_restart,
MACHINE_END