diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-09-20 07:48:00 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-20 07:48:32 +0400 |
| commit | c88739b373e4930ed082a607cb78bf82616fd076 (patch) | |
| tree | 251d969aa816dab5a62e6b36208b189b37de6534 /arch/arm/plat-mxc/tzic.c | |
| parent | 3211af1119174fbe8b676422b74870cdd51d7314 (diff) | |
| parent | 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 (diff) | |
| download | linux-c88739b373e4930ed082a607cb78bf82616fd076.tar.xz | |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'arch/arm/plat-mxc/tzic.c')
| -rw-r--r-- | arch/arm/plat-mxc/tzic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c index b3da9aad4295..3703ab28257f 100644 --- a/arch/arm/plat-mxc/tzic.c +++ b/arch/arm/plat-mxc/tzic.c @@ -164,8 +164,9 @@ int tzic_enable_wake(int is_idle) return -EAGAIN; for (i = 0; i < 4; i++) { - v = is_idle ? __raw_readl(TZIC_ENSET0(i)) : wakeup_intr[i]; - __raw_writel(v, TZIC_WAKEUP0(i)); + v = is_idle ? __raw_readl(tzic_base + TZIC_ENSET0(i)) : + wakeup_intr[i]; + __raw_writel(v, tzic_base + TZIC_WAKEUP0(i)); } return 0; |