aboutsummaryrefslogtreecommitdiff
path: root/sound/oss/btaudio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 18:41:42 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 18:41:42 -0800
commit977127174a7dff52d17faeeb4c4949a54221881f (patch)
treeb05b9d18a1256d7ed97bdfb537213a8d70ccca57 /sound/oss/btaudio.c
parent80c0531514516e43ae118ddf38424e06e5c3cb3c (diff)
parent93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'sound/oss/btaudio.c')
-rw-r--r--sound/oss/btaudio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index a85093fec7b..4007a5680ac 100644
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -1101,7 +1101,7 @@ static int btaudio_init_module(void)
digital ? "digital" : "",
analog && digital ? "+" : "",
analog ? "analog" : "");
- return pci_module_init(&btaudio_pci_driver);
+ return pci_register_driver(&btaudio_pci_driver);
}
static void btaudio_cleanup_module(void)