diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:35 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:35 +0200 |
commit | 382e6a859e6622de0aa62c01976ae8ebd90e986d (patch) | |
tree | 2501c554c231c5d0fcda7ff2e6e055bf23134d6f /sound/pci/maestro3.c | |
parent | Merge branch 'topic/hda' into for-linus (diff) | |
parent | ALSA: snd-usb: fix stream info output in /proc (diff) | |
download | linux-dev-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.xz linux-dev-382e6a859e6622de0aa62c01976ae8ebd90e986d.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/maestro3.c')
-rw-r--r-- | sound/pci/maestro3.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 78229b0dad2b..deef21399586 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c @@ -2837,7 +2837,7 @@ static void __devexit snd_m3_remove(struct pci_dev *pci) pci_set_drvdata(pci, NULL); } -static struct pci_driver driver = { +static struct pci_driver m3_driver = { .name = KBUILD_MODNAME, .id_table = snd_m3_ids, .probe = snd_m3_probe, @@ -2848,15 +2848,4 @@ static struct pci_driver driver = { #endif }; -static int __init alsa_card_m3_init(void) -{ - return pci_register_driver(&driver); -} - -static void __exit alsa_card_m3_exit(void) -{ - pci_unregister_driver(&driver); -} - -module_init(alsa_card_m3_init) -module_exit(alsa_card_m3_exit) +module_pci_driver(m3_driver); |