diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /sound/oss/kahlua.c | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
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.c | 2 |
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 = { | |||
| 218 | static int __init kahlua_init_module(void) | 218 | static int __init kahlua_init_module(void) |
| 219 | { | 219 | { |
| 220 | printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n"); | 220 | printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n"); |
| 221 | return pci_module_init(&kahlua_driver); | 221 | return pci_register_driver(&kahlua_driver); |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | static void __devexit kahlua_cleanup_module(void) | 224 | static void __devexit kahlua_cleanup_module(void) |