Merge branch 'for-linus' into for-next

[firefly-linux-kernel-4.4.55.git] / sound / pci / ctxfi / ctatc.c

diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 2f6e9c762d3fd184dd995b17a9485faf050dffeb..a2f997a9977a7218e1085b9ee75857ab45f9ee44 100644 (file)
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1536,7 +1536,7 @@ static void atc_connect_resources(struct ct_atc *atc)
        }
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int atc_suspend(struct ct_atc *atc)
 {
        int i;
@@ -1647,7 +1647,7 @@ static struct ct_atc atc_preset __devinitdata = {
        .output_switch_put = atc_output_switch_put,
        .mic_source_switch_get = atc_mic_source_switch_get,
        .mic_source_switch_put = atc_mic_source_switch_put,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
        .suspend = atc_suspend,
        .resume = atc_resume,
 #endif