summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2012-03-20 00:16:38 +0100
committerRobert Lee <b18647@b18647-12.(none)>2012-03-19 20:42:47 -0500
commit569aa60b8a69618517202fb3490c08e716327395 (patch)
tree18653171e0f6185714a4f061a262891b878c2d78
parent5587dae019fae5ed313599954895a330a2f58457 (diff)
fix compilation error with CONFIG_DB550 and CONFIG_CPU_IDLE
* db5500_prcmu_set_power_state * db5500_prcmu_enable_wakeups are called from prcmu_set_power_state and prcmu_enable_wakeups but they are not defined. When applying the cpuidle patch, the code invokes both functions and that leads to an undefined functions compilation error. So let's do like the other functions and return EINVAL. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--include/linux/mfd/dbx500-prcmu.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index 27f35b8a107..df7a835c447 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -230,8 +230,7 @@ static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
bool keep_ap_pll)
{
if (machine_is_u5500())
- return db5500_prcmu_set_power_state(state, keep_ulp_clk,
- keep_ap_pll);
+ return -EINVAL;
else
return db8500_prcmu_set_power_state(state, keep_ulp_clk,
keep_ap_pll);
@@ -296,7 +295,7 @@ static inline int prcmu_set_epod(u16 epod_id, u8 epod_state)
static inline void prcmu_enable_wakeups(u32 wakeups)
{
if (machine_is_u5500())
- db5500_prcmu_enable_wakeups(wakeups);
+ return;
else
db8500_prcmu_enable_wakeups(wakeups);
}