Commit 1fb372f8 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge branch 'for-3.4/fixes-for-final' of...

Merge branch 'for-3.4/fixes-for-final' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes

* 'for-3.4/fixes-for-final' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Fix flow controller accesses
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 139abbf5 97e7abc5
...@@ -53,10 +53,10 @@ static void flowctrl_update(u8 offset, u32 value) ...@@ -53,10 +53,10 @@ static void flowctrl_update(u8 offset, u32 value)
void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value) void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value)
{ {
return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value); return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);
} }
void flowctrl_write_cpu_halt(unsigned int cpuid, u32 value) void flowctrl_write_cpu_halt(unsigned int cpuid, u32 value)
{ {
return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value); return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment