diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
| commit | cf81d6b583444cb6f5e656f050e43413b236354e (patch) | |
| tree | 646567ef019e0bbc5cc9db0e26c464a9fc239481 /sound/isa/ad1848/ad1848.c | |
| parent | ALSA: usb-audio: Fix quirks code is not called (diff) | |
| parent | ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members (diff) | |
| download | linux-dev-cf81d6b583444cb6f5e656f050e43413b236354e.tar.xz linux-dev-cf81d6b583444cb6f5e656f050e43413b236354e.zip | |
Merge branch 'for-next' into for-linus
Merged 4.8 changes.
Diffstat (limited to 'sound/isa/ad1848/ad1848.c')
| -rw-r--r-- | sound/isa/ad1848/ad1848.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c index f159da4ec890..a302d1f8d14f 100644 --- a/sound/isa/ad1848/ad1848.c +++ b/sound/isa/ad1848/ad1848.c @@ -170,15 +170,4 @@ static struct isa_driver snd_ad1848_driver = { } }; -static int __init alsa_card_ad1848_init(void) -{ - return isa_register_driver(&snd_ad1848_driver, SNDRV_CARDS); -} - -static void __exit alsa_card_ad1848_exit(void) -{ - isa_unregister_driver(&snd_ad1848_driver); -} - -module_init(alsa_card_ad1848_init); -module_exit(alsa_card_ad1848_exit); +module_isa_driver(snd_ad1848_driver, SNDRV_CARDS); |