diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 01:07:01 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 01:07:01 +0100 |
| commit | 96a1c18a7b41b084dff5cf83383f46f264eeb84a (patch) | |
| tree | 52e749929cfee1a81d7b1addc3bdcfaee76f3235 | |
| parent | i2c-hid / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM (diff) | |
| download | linux-96a1c18a7b41b084dff5cf83383f46f264eeb84a.tar.xz linux-96a1c18a7b41b084dff5cf83383f46f264eeb84a.zip | |
hsi / OMAP / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.
Do that for the omap_ssi driver.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-By: Sebastian Reichel <sre@kernel.org>
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi.c | 2 | ||||
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_port.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c index bf0eace4cb67..4d5b682fc6af 100644 --- a/drivers/hsi/controllers/omap_ssi.c +++ b/drivers/hsi/controllers/omap_ssi.c @@ -555,7 +555,7 @@ static int __exit ssi_remove(struct platform_device *pd) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int omap_ssi_runtime_suspend(struct device *dev) { struct hsi_controller *ssi = dev_get_drvdata(dev); diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c index 4c0b5820581e..d836cfe50513 100644 --- a/drivers/hsi/controllers/omap_ssi_port.c +++ b/drivers/hsi/controllers/omap_ssi_port.c @@ -1260,7 +1260,7 @@ static int __exit ssi_port_remove(struct platform_device *pd) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int ssi_save_port_ctx(struct omap_ssi_port *omap_port) { struct hsi_port *port = to_hsi_port(omap_port->dev); |