diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-17 17:04:27 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-17 17:04:42 -0700 |
| commit | b08d48414e73fbf743a93b96e2e5449775239e4a (patch) | |
| tree | e6c5bc985ce4c10e88c97d69d8f334cb8a6f1a1e /arch/arm/mach-tegra/board-dt-tegra20.c | |
| parent | 69648ae885e7de8be223362ea6e95c79066069e7 (diff) | |
| parent | bf88ef883585ebc1a6c2369483833ed11ca7666c (diff) | |
| download | kernel_goldelico_gta04-b08d48414e73fbf743a93b96e2e5449775239e4a.zip kernel_goldelico_gta04-b08d48414e73fbf743a93b96e2e5449775239e4a.tar.gz kernel_goldelico_gta04-b08d48414e73fbf743a93b96e2e5449775239e4a.tar.bz2 | |
Merge tag 'tegra-for-3.7-fixes-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes
From Stephen Warren: ARM: tegra: fixes for 3.7-rc2
This branch contains a couple small fixes for Tegra for 3.7.
* A fix for another clock rate calculation overflow
* A revert of a change that removed the "timer" clock on Tegra, coupled
with a fix for the confusing symbol name clash that triggered it.
* tag 'tegra-for-3.7-fixes-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: add tegra_timer clock
ARM: tegra: rename tegra system timer
ARM: tegra30: clk: Fix output_rate overflow
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra20.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 57e235f..aa5325c 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -182,7 +182,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") .init_early = tegra20_init_early, .init_irq = tegra_dt_init_irq, .handle_irq = gic_handle_irq, - .timer = &tegra_timer, + .timer = &tegra_sys_timer, .init_machine = tegra_dt_init, .init_late = tegra_dt_init_late, .restart = tegra_assert_system_reset, |