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/cs46xx | |
| 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/cs46xx')
| -rw-r--r-- | sound/pci/cs46xx/cs46xx.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c index 819d79d0586d..6cc7404e0e8f 100644 --- a/sound/pci/cs46xx/cs46xx.c +++ b/sound/pci/cs46xx/cs46xx.c @@ -161,7 +161,7 @@ static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci) pci_set_drvdata(pci, NULL); } -static struct pci_driver driver = { +static struct pci_driver cs46xx_driver = { .name = KBUILD_MODNAME, .id_table = snd_cs46xx_ids, .probe = snd_card_cs46xx_probe, @@ -172,15 +172,4 @@ static struct pci_driver driver = { #endif }; -static int __init alsa_card_cs46xx_init(void) -{ - return pci_register_driver(&driver); -} - -static void __exit alsa_card_cs46xx_exit(void) -{ - pci_unregister_driver(&driver); -} - -module_init(alsa_card_cs46xx_init) -module_exit(alsa_card_cs46xx_exit) +module_pci_driver(cs46xx_driver); |