diff options
author | Andy Green <andy.green@linaro.org> | 2012-04-25 09:43:02 +0800 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2012-04-25 09:43:02 +0800 |
commit | 24dd24afb9718d9257b5b09595868b8c0f8f332a (patch) | |
tree | d4e1277f10ed06d7c3373948372ec8f3d046ba90 | |
parent | 9cc76c3f2b74ba871a14b32c0af9f923c7c9cf52 (diff) |
uplevel linux linaro basis duplicated mmc endiftilt-3.4-omap5-eng-3
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r-- | drivers/mmc/core/bus.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 32850601c9fa..a00058cdaa5a 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -165,8 +165,6 @@ static int mmc_runtime_idle(struct device *dev) } #endif /* CONFIG_PM_RUNTIME */ -#endif /* !CONFIG_PM_RUNTIME */ - static const struct dev_pm_ops mmc_bus_pm_ops = { SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume, mmc_runtime_idle) |