summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/pcm027.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2013-01-15 04:44:27 (GMT)
committerStephen Warren <swarren@wwwdotorg.org>2013-01-15 04:44:27 (GMT)
commitb2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch)
treeed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-pxa/pcm027.c
parent9931faca02c604c22335f5a935a501bb2ace6e20 (diff)
parent90cf214d6a549bf482e3c5751ee256cc885b96ea (diff)
downloadlinux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.xz
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/arm/mach-pxa/pcm027.c')
-rw-r--r--arch/arm/mach-pxa/pcm027.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c
index fe90544..69918c7 100644
--- 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