block / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 4 Dec 2014 00:00:23 +0000 (01:00 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 4 Dec 2014 00:00:23 +0000 (01:00 +0100)
commit47fafbc701fecf112cfa580f61db229b9f68aba4
tree651871dc1e0a96e105a5401c228a85207f04acbe
parentceb6c9c862c86423f41c1e20ecf8d454f837f519
block / 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 in the block device core.

Reviewed-by: Aaron Lu <aaron.lu@intel.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
block/blk-core.c
block/elevator.c
include/linux/blkdev.h