diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 15:13:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 15:13:14 +0100 |
commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /sound/usb/usx2y/us122l.c | |
parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
download | op-kernel-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.zip op-kernel-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.tar.gz |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/usb/usx2y/us122l.c')
-rw-r--r-- | sound/usb/usx2y/us122l.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c index 86f76a9..c4fd3b1 100644 --- a/sound/usb/usx2y/us122l.c +++ b/sound/usb/usx2y/us122l.c @@ -772,16 +772,4 @@ static struct usb_driver snd_us122l_usb_driver = { .supports_autosuspend = 1 }; - -static int __init snd_us122l_module_init(void) -{ - return usb_register(&snd_us122l_usb_driver); -} - -static void __exit snd_us122l_module_exit(void) -{ - usb_deregister(&snd_us122l_usb_driver); -} - -module_init(snd_us122l_module_init) -module_exit(snd_us122l_module_exit) +module_usb_driver(snd_us122l_usb_driver); |