diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-25 01:43:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-25 01:43:04 -0400 |
| commit | 314820c9e892d8f41ba4db300ec96770d9c8294b (patch) | |
| tree | 3d5c59a429239b180c77e57f998a78d3f2b79827 /sound/pci/cs4281.c | |
| parent | e76b8ee25e034ab601b525abb95cea14aa167ed3 (diff) | |
| parent | 07b8481d4aff73d6f451f25e74ea10240ff5131e (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index a9f368f60df6..33506ee569bd 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -2084,7 +2084,7 @@ static int cs4281_resume(struct pci_dev *pci) | |||
| 2084 | } | 2084 | } |
| 2085 | #endif /* CONFIG_PM */ | 2085 | #endif /* CONFIG_PM */ |
| 2086 | 2086 | ||
| 2087 | static struct pci_driver driver = { | 2087 | static struct pci_driver cs4281_driver = { |
| 2088 | .name = KBUILD_MODNAME, | 2088 | .name = KBUILD_MODNAME, |
| 2089 | .id_table = snd_cs4281_ids, | 2089 | .id_table = snd_cs4281_ids, |
| 2090 | .probe = snd_cs4281_probe, | 2090 | .probe = snd_cs4281_probe, |
| @@ -2095,15 +2095,4 @@ static struct pci_driver driver = { | |||
| 2095 | #endif | 2095 | #endif |
| 2096 | }; | 2096 | }; |
| 2097 | 2097 | ||
| 2098 | static int __init alsa_card_cs4281_init(void) | 2098 | module_pci_driver(cs4281_driver); |
| 2099 | { | ||
| 2100 | return pci_register_driver(&driver); | ||
| 2101 | } | ||
| 2102 | |||
| 2103 | static void __exit alsa_card_cs4281_exit(void) | ||
| 2104 | { | ||
| 2105 | pci_unregister_driver(&driver); | ||
| 2106 | } | ||
| 2107 | |||
| 2108 | module_init(alsa_card_cs4281_init) | ||
| 2109 | module_exit(alsa_card_cs4281_exit) | ||