diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-19 08:21:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-19 08:21:57 +0200 |
| commit | 1558eb838ff502faafacf26b6a711dbaae796009 (patch) | |
| tree | 8049ea20a214033369725ed58b8b4a3ca4110887 /sound/pci/trident/trident.c | |
| parent | Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff) | |
| parent | ALSA: Move some headers to local directories from include/sound (diff) | |
| download | linux-1558eb838ff502faafacf26b6a711dbaae796009.tar.xz linux-1558eb838ff502faafacf26b6a711dbaae796009.zip | |
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.
Diffstat (limited to 'sound/pci/trident/trident.c')
| -rw-r--r-- | sound/pci/trident/trident.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index 611983ec7321..d36e6ca147e1 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c @@ -26,7 +26,7 @@ #include <linux/time.h> #include <linux/module.h> #include <sound/core.h> -#include <sound/trident.h> +#include "trident.h" #include <sound/initval.h> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, <audio@tridentmicro.com>"); @@ -178,8 +178,9 @@ static struct pci_driver trident_driver = { .probe = snd_trident_probe, .remove = __devexit_p(snd_trident_remove), #ifdef CONFIG_PM - .suspend = snd_trident_suspend, - .resume = snd_trident_resume, + .driver = { + .pm = &snd_trident_pm, + }, #endif }; |