diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-15 05:44:27 +0100 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-15 05:44:27 +0100 |
| commit | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | |
| parent | Linux 3.8-rc3 (diff) | |
| parent | ARM: at91: fix board-rm9200-dt after sys_timer conversion (diff) | |
| download | linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.xz linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.zip | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/arm/mach-mv78xx0/buffalo-wxl-setup.c')
| -rw-r--r-- | arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c index ee74ec97c141..1f2ef98b37c6 100644 --- a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c +++ b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c @@ -150,6 +150,6 @@ MACHINE_START(TERASTATION_WXL, "Buffalo Nas WXL") .map_io = mv78xx0_map_io, .init_early = mv78xx0_init_early, .init_irq = mv78xx0_init_irq, - .timer = &mv78xx0_timer, + .init_time = mv78xx0_timer_init, .restart = mv78xx0_restart, MACHINE_END |