summaryrefslogtreecommitdiffstats
path: root/sound/pci/rme96.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 00:06:06 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 00:06:06 +0200
commitaef7b83c92dd0b7e994805440655d1d64147287b (patch)
tree981f373358c1988e061625e8f272013065cb086f /sound/pci/rme96.c
parent[netdrvr] Fix register_netdev() races in older ISA net drivers (diff)
parentMerge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-aef7b83c92dd0b7e994805440655d1d64147287b.tar.xz
linux-aef7b83c92dd0b7e994805440655d1d64147287b.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/pci/rme96.c')
-rw-r--r--sound/pci/rme96.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 8e2666841d21..10c4f45a913c 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -2437,7 +2437,7 @@ static struct pci_driver driver = {
static int __init alsa_card_rme96_init(void)
{
- return pci_module_init(&driver);
+ return pci_register_driver(&driver);
}
static void __exit alsa_card_rme96_exit(void)