diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 22:47:29 +0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 22:47:29 +0400 |
| commit | 2d61aecee8f32259920cdf90a452fa26ffc64e9f (patch) | |
| tree | 2311b6b4c12b946164e8cfb3422cebdfecf08f37 /arch/arm/mach-pxa/h5000.c | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 6bb27d7349db51b50c40534710fe164ca0d58902 (diff) | |
| download | linux-2d61aecee8f32259920cdf90a452fa26ffc64e9f.tar.xz | |
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
Diffstat (limited to 'arch/arm/mach-pxa/h5000.c')
| -rw-r--r-- | arch/arm/mach-pxa/h5000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index e7dec589f014..875ec3351499 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c @@ -208,7 +208,7 @@ MACHINE_START(H5400, "HP iPAQ H5000") .nr_irqs = PXA_NR_IRQS, .init_irq = pxa25x_init_irq, .handle_irq = pxa25x_handle_irq, - .timer = &pxa_timer, + .init_time = pxa_timer_init, .init_machine = h5000_init, .restart = pxa_restart, MACHINE_END |