diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 16:43:07 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 20:56:02 -0500 |
commit | bbd6d050754731ee882e5c80fba448db2a63dfe8 (patch) | |
tree | 85356989d7db80e15e79b77b2e458d6608d5d5d7 /drivers/misc/lis3lv02d | |
parent | e243c7c1a41476d505ee77481c08ff32470edbeb (diff) |
misc / 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.
Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
drivers/misc/.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/lis3lv02d')
-rw-r--r-- | drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c index d324f8a97b88..63fe096d4462 100644 --- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c +++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c | |||
@@ -235,7 +235,7 @@ static int lis3lv02d_i2c_resume(struct device *dev) | |||
235 | } | 235 | } |
236 | #endif /* CONFIG_PM_SLEEP */ | 236 | #endif /* CONFIG_PM_SLEEP */ |
237 | 237 | ||
238 | #ifdef CONFIG_PM_RUNTIME | 238 | #ifdef CONFIG_PM |
239 | static int lis3_i2c_runtime_suspend(struct device *dev) | 239 | static int lis3_i2c_runtime_suspend(struct device *dev) |
240 | { | 240 | { |
241 | struct i2c_client *client = container_of(dev, struct i2c_client, dev); | 241 | struct i2c_client *client = container_of(dev, struct i2c_client, dev); |
@@ -253,7 +253,7 @@ static int lis3_i2c_runtime_resume(struct device *dev) | |||
253 | lis3lv02d_poweron(lis3); | 253 | lis3lv02d_poweron(lis3); |
254 | return 0; | 254 | return 0; |
255 | } | 255 | } |
256 | #endif /* CONFIG_PM_RUNTIME */ | 256 | #endif /* CONFIG_PM */ |
257 | 257 | ||
258 | static const struct i2c_device_id lis3lv02d_id[] = { | 258 | static const struct i2c_device_id lis3lv02d_id[] = { |
259 | {"lis3lv02d", LIS3LV02D}, | 259 | {"lis3lv02d", LIS3LV02D}, |