Merge branch 'topic/pm-convert' into for-next

This merges the changes for converting to new PM ops for platform
and some other drivers.
Also move some header files to local places from the public
include/sound.

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index a4ac1de7aa19..c422d330ca54 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -706,7 +706,7 @@ struct hda_codec_ops {
         void (*set_power_state)(struct hda_codec *codec, hda_nid_t fg,
                                 unsigned int power_state);
 #ifdef CONFIG_PM
-        int (*suspend)(struct hda_codec *codec, pm_message_t state);
+        int (*suspend)(struct hda_codec *codec);
         int (*resume)(struct hda_codec *codec);
 #endif
 #ifdef CONFIG_SND_HDA_POWER_SAVE