diff --git a/[refs] b/[refs] index 5c1e12a1b583..4943a875fd91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e80a5dea8e056d8f398be1900d61c581d379f02f +refs/heads/master: 1f1bf132d81ed723bc5fefbcec7d0779ce683a4f diff --git a/trunk/drivers/base/power/runtime.c b/trunk/drivers/base/power/runtime.c index adbc3148c039..4bafef83e79f 100644 --- a/trunk/drivers/base/power/runtime.c +++ b/trunk/drivers/base/power/runtime.c @@ -64,6 +64,7 @@ int dpm_runtime_suspend(struct device * dev, pm_message_t state) } +#if 0 /** * dpm_set_power_state - Update power_state field. * @dev: Device. @@ -80,3 +81,4 @@ void dpm_set_power_state(struct device * dev, pm_message_t state) dev->power.power_state = state; up(&dpm_sem); } +#endif /* 0 */