Merge tag 'pm+acpi-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux.git] / drivers / mmc / host / sdhci-esdhc-imx.c

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 12711ab51aed24ecd32d1d967112b65f94bae7b0..af1f7c0f95450e94a923146f4d53240b7ba3e821 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1108,7 +1108,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev)
        pm_runtime_dont_use_autosuspend(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
 
-       if (!IS_ENABLED(CONFIG_PM_RUNTIME)) {
+       if (!IS_ENABLED(CONFIG_PM)) {
                clk_disable_unprepare(imx_data->clk_per);
                clk_disable_unprepare(imx_data->clk_ipg);
                clk_disable_unprepare(imx_data->clk_ahb);
@@ -1119,7 +1119,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int sdhci_esdhc_runtime_suspend(struct device *dev)
 {
        struct sdhci_host *host = dev_get_drvdata(dev);