diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 14:51:35 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 14:51:35 +0400 |
| commit | 382e6a859e6622de0aa62c01976ae8ebd90e986d (patch) | |
| tree | 2501c554c231c5d0fcda7ff2e6e055bf23134d6f /sound/pci/oxygen/virtuoso.c | |
| parent | 6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff) | |
| parent | 97f8d3b6503082416898f893a442a78f8819c42a (diff) | |
| download | linux-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
| -rw-r--r-- | sound/pci/oxygen/virtuoso.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 3fdee4950174..19962c6d38c3 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -100,15 +100,4 @@ static struct pci_driver xonar_driver = { .shutdown = oxygen_pci_shutdown, }; -static int __init alsa_card_xonar_init(void) -{ - return pci_register_driver(&xonar_driver); -} - -static void __exit alsa_card_xonar_exit(void) -{ - pci_unregister_driver(&xonar_driver); -} - -module_init(alsa_card_xonar_init) -module_exit(alsa_card_xonar_exit) +module_pci_driver(xonar_driver); |