From: Ulf Hansson Date: Mon, 25 Aug 2014 10:03:20 +0000 (+0200) Subject: mmc: tmio: Make runtime PM callbacks available for CONFIG_PM X-Git-Tag: upstream/snapshot3+hdmi~21^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac3f5081c30ef6541da70e79bd27d3d2756430df;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git mmc: tmio: Make runtime PM callbacks available for CONFIG_PM To give the option for tmio hosts to use the runtime PM callbacks for CONFIG_PM_SLEEP as well as CONFIG_PM_RUNTIME, move them to CONFIG_PM. Signed-off-by: Ulf Hansson Acked-by: Geert Uytterhoeven (cherry picked from commit 9ade7dbf20e8fc73d9784b772e320239de2acf08) Signed-off-by: Simon Horman --- diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index f1ee3e4..2ad52d6 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -149,7 +149,7 @@ int tmio_mmc_host_suspend(struct device *dev); int tmio_mmc_host_resume(struct device *dev); #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM int tmio_mmc_host_runtime_suspend(struct device *dev); int tmio_mmc_host_runtime_resume(struct device *dev); #endif diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index d52280d..494ecc5 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1162,7 +1162,7 @@ int tmio_mmc_host_resume(struct device *dev) EXPORT_SYMBOL(tmio_mmc_host_resume); #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM int tmio_mmc_host_runtime_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev);