linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / isdn / hardware / eicon / divasmain.c

diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index b7dadba..c9b26e8 100644 (file)
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -9,10 +9,12 @@
  * of the GNU General Public License, incorporated herein by reference.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/devfs_fs_kernel.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
@@ -486,7 +488,7 @@ void __inline__ outpp(void __iomem *addr, word p)
 int diva_os_register_irq(void *context, byte irq, const char *name)
 {
        int result = request_irq(irq, diva_os_irq_wrapper,
-                                IRQF_DISABLED | IRQF_SHARED, name, context);
+                                SA_INTERRUPT | SA_SHIRQ, name, context);
        return (result);
 }
 
@@ -676,6 +678,7 @@ static struct file_operations divas_fops = {
 
 static void divas_unregister_chrdev(void)
 {
+       devfs_remove(DEVNAME);
        unregister_chrdev(major, DEVNAME);
 }
 
@@ -687,6 +690,7 @@ static int DIVA_INIT_FUNCTION divas_register_chrdev(void)
                       DRIVERLNAME);
                return (0);
        }
+       devfs_mk_cdev(MKDEV(major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVNAME);
 
        return (1);
 }