diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
| commit | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-socfpga/socfpga.c | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.gz linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.xz | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/arm/mach-socfpga/socfpga.c')
| -rw-r--r-- | arch/arm/mach-socfpga/socfpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index 6732924a5fee..b54baea5f809 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -107,7 +107,7 @@ DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA") .map_io = socfpga_map_io, .init_irq = gic_init_irq, .handle_irq = gic_handle_irq, - .timer = &dw_apb_timer, + .init_time = dw_apb_timer_init, .init_machine = socfpga_cyclone5_init, .restart = socfpga_cyclone5_restart, .dt_compat = altera_dt_match, |