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/trident/trident.c | |
| parent | 6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff) | |
| parent | 97f8d3b6503082416898f893a442a78f8819c42a (diff) | |
| download | kernel_goldelico_gta04-382e6a859e6622de0aa62c01976ae8ebd90e986d.zip kernel_goldelico_gta04-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.gz kernel_goldelico_gta04-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.bz2 | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/trident/trident.c')
| -rw-r--r-- | sound/pci/trident/trident.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index 5f1def7..611983e 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c @@ -172,7 +172,7 @@ static void __devexit snd_trident_remove(struct pci_dev *pci) pci_set_drvdata(pci, NULL); } -static struct pci_driver driver = { +static struct pci_driver trident_driver = { .name = KBUILD_MODNAME, .id_table = snd_trident_ids, .probe = snd_trident_probe, @@ -183,15 +183,4 @@ static struct pci_driver driver = { #endif }; -static int __init alsa_card_trident_init(void) -{ - return pci_register_driver(&driver); -} - -static void __exit alsa_card_trident_exit(void) -{ - pci_unregister_driver(&driver); -} - -module_init(alsa_card_trident_init) -module_exit(alsa_card_trident_exit) +module_pci_driver(trident_driver); |