From: Rafael J. Wysocki Date: Fri, 19 Dec 2014 14:26:46 +0000 (+0100) Subject: sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM X-Git-Tag: omap-for-v3.20/drop-legacy-3517~9^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45544c884e16901e8c3df9ba0da18fd41f766b93;p=pandora-kernel.git sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM The sst-haswell-pcm driver is a new user of CONFIG_PM_RUNTIME. However, 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 sound/soc/intel/sst-haswell-pcm.c. Signed-off-by: Rafael J. Wysocki Acked-by: Mark Brown --- Reading git-diff-tree failed