projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: Move some headers to local directories from include/sound
[linux-block.git]
/
sound
/
pci
/
cs46xx
/
cs46xx.c
diff --git
a/sound/pci/cs46xx/cs46xx.c
b/sound/pci/cs46xx/cs46xx.c
index 6cc7404e0e8f62991120eb5a86f835017c84cdf3..1e007c736a8bf6b939334fcc3ee9d5faf0ec14f7 100644
(file)
--- a/
sound/pci/cs46xx/cs46xx.c
+++ b/
sound/pci/cs46xx/cs46xx.c
@@
-30,7
+30,7
@@
#include <linux/init.h>
#include <linux/module.h>
#include <sound/core.h>
#include <linux/init.h>
#include <linux/module.h>
#include <sound/core.h>
-#include
<sound/cs46xx.h>
+#include
"cs46xx.h"
#include <sound/initval.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
#include <sound/initval.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@
-167,8
+167,9
@@
static struct pci_driver cs46xx_driver = {
.probe = snd_card_cs46xx_probe,
.remove = __devexit_p(snd_card_cs46xx_remove),
#ifdef CONFIG_PM
.probe = snd_card_cs46xx_probe,
.remove = __devexit_p(snd_card_cs46xx_remove),
#ifdef CONFIG_PM
- .suspend = snd_cs46xx_suspend,
- .resume = snd_cs46xx_resume,
+ .driver = {
+ .pm = &snd_cs46xx_pm,
+ },
#endif
};
#endif
};