Merge branch 'master' into for_paulus

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

diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index 2d80d94b5d0c54603310391b0d235928acc65944..556b19615bc76e2e8a1a0cb7458687f7449370b0 100644 (file)
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -10,7 +10,6 @@
  * 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>
@@ -19,7 +18,6 @@
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
-#include <linux/devfs_fs_kernel.h>
 #include <asm/uaccess.h>
 
 #include "platform.h"
@@ -133,7 +131,7 @@ static void remove_um_idi_proc(void)
        }
 }
 
-static struct file_operations divas_idi_fops = {
+static const struct file_operations divas_idi_fops = {
        .owner   = THIS_MODULE,
        .llseek  = no_llseek,
        .read    = um_idi_read,
@@ -145,7 +143,6 @@ static struct file_operations divas_idi_fops = {
 
 static void divas_idi_unregister_chrdev(void)
 {
-       devfs_remove(DEVNAME);
        unregister_chrdev(major, DEVNAME);
 }