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, 3 insertions, 2 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 610275bfbaeb..37520a2b4dcf 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -873,8 +873,9 @@ static struct pci_driver oxygen_driver = {
         .probe = generic_oxygen_probe,
         .remove = __devexit_p(oxygen_pci_remove),
 #ifdef CONFIG_PM
-        .suspend = oxygen_pci_suspend,
-        .resume = oxygen_pci_resume,
+        .driver = {
+                .pm = &oxygen_pci_pm,
+        },
 #endif
 };