Merge branch 'topic/hda-config-pm-cleanup' into for-next

[linux-2.6-block.git] / sound / pci / hda / patch_conexant.c

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index e8209178d87bbcc88551e6773c90c9fec7d98af2..17389a3801bd12976f3552e3e89cbbf4cd18ebed 100644 (file)
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -294,13 +294,11 @@ static void cx_jack_unsol_event(struct hda_codec *codec, unsigned int res)
        snd_hda_jack_unsol_event(codec, res);
 }
 
-#ifdef CONFIG_PM
 static int cx_auto_suspend(struct hda_codec *codec)
 {
        cx_auto_shutdown(codec);
        return 0;
 }
-#endif
 
 static const struct hda_codec_ops cx_auto_patch_ops = {
        .build_controls = snd_hda_gen_build_controls,
@@ -308,10 +306,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
        .init = cx_auto_init,
        .free = cx_auto_free,
        .unsol_event = cx_jack_unsol_event,
-#ifdef CONFIG_PM
        .suspend = cx_auto_suspend,
        .check_power_status = snd_hda_gen_check_power_status,
-#endif
 };
 
 /*