diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2012-03-20 00:16:37 +0100 |
|---|---|---|
| committer | Robert Lee <b18647@b18647-12.(none)> | 2012-03-19 20:42:47 -0500 |
| commit | 5587dae019fae5ed313599954895a330a2f58457 (patch) | |
| tree | 01b72137e51ea2b9fba3050c63e034b65b453142 | |
| parent | 3e4e9a48c8057d76bc5d45a2337c0406c2a77b90 (diff) | |
fix prcmu routine backport from mfd-2.6
The mfd-2.6 kernel tree use the cpu_is_u5500 function
while this version use machine_is_u5500.
An error was introduced by backporting prcmu_is_cpu_in_wfi function
from the mfd-2.6 kernel tree.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
| -rw-r--r-- | include/linux/mfd/dbx500-prcmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h index b74a474f97f..27f35b8a107 100644 --- a/include/linux/mfd/dbx500-prcmu.h +++ b/include/linux/mfd/dbx500-prcmu.h @@ -271,7 +271,7 @@ static inline bool prcmu_pending_irq(void) static inline bool prcmu_is_cpu_in_wfi(int cpu) { - if (cpu_is_u5500()) + if (machine_is_u5500()) return -EINVAL; else return db8500_prcmu_is_cpu_in_wfi(cpu); |