aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/kahlua.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/kahlua.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6 (diff)
parent[PATCH] drivers/*rest*: Replace pci_module_init() with pci_register_driver() (diff)
downloadlinux-dev-977127174a7dff52d17faeeb4c4949a54221881f.tar.xz
linux-dev-977127174a7dff52d17faeeb4c4949a54221881f.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'sound/oss/kahlua.c')
-rw-r--r--sound/oss/kahlua.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index 808c5ef969be..2835a7c038ef 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -218,7 +218,7 @@ static struct pci_driver kahlua_driver = {
static int __init kahlua_init_module(void)
{
printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n");
- return pci_module_init(&kahlua_driver);
+ return pci_register_driver(&kahlua_driver);
}
static void __devexit kahlua_cleanup_module(void)