From 5587dae019fae5ed313599954895a330a2f58457 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Tue, 20 Mar 2012 00:16:37 +0100 Subject: 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 --- include/linux/mfd/dbx500-prcmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3