summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2016-04-08 13:40:53 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-22 01:32:37 +0200
commit372a12ed9d99c02f105278a9b75f0cb176d15cc1 (patch)
tree196d377f99169848670dccc2ce50462a6ea4587c /drivers/mmc
parent0ae3aeefabbeef26294e7a349b51f1c761d46c9f (diff)
downloadop-kernel-dev-372a12ed9d99c02f105278a9b75f0cb176d15cc1.zip
op-kernel-dev-372a12ed9d99c02f105278a9b75f0cb176d15cc1.tar.gz
PM / Runtime: Move ignore_children flag under CONFIG_PM
The ignore_children flag is used only when CONFIG_PM is set, so let's move it into that section within the struct dev_pm_info. Move also the corresponding pm_suspend_ignore_children() API out of device.h into pm_runtime.h, to be consistent with similar APIs. Unfortunate this causes the Toshiba PCI SD mmc host driver to fail to compile as it needs pm_runtime.h, so let's fix this here as well. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/toshsd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/toshsd.c b/drivers/mmc/host/toshsd.c
index e2cdd5f..553ef41 100644
--- a/drivers/mmc/host/toshsd.c
+++ b/drivers/mmc/host/toshsd.c
@@ -21,6 +21,7 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/pm.h>
+#include <linux/pm_runtime.h>
#include <linux/mmc/host.h>
#include <linux/mmc/mmc.h>
OpenPOWER on IntegriCloud