Add changes from the Linux-2.6 tree.

[linux-2.6.git] / sound / oss / kahlua.c

diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index 3d1d636..12e7b30 100644 (file)
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -27,7 +27,6 @@
  *     same manner.
  */
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -56,7 +55,7 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
 {
        struct address_info *hw_config;
        unsigned long base;
-       void *mem;
+       void __iomem *mem;
        unsigned long io;
        u16 map;
        u8 irq, dma8, dma16;
@@ -218,7 +217,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)