Pull misc-for-upstream into release branch

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

diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 91fc92c01afe84930dc5bd5838a9db52ebb1c6d5..5e862e2441171e029954a76a01713bd5aa8adf72 100644 (file)
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
@@ -663,7 +662,7 @@ static unsigned int divas_poll(struct file *file, poll_table * wait)
        return (POLLIN | POLLRDNORM);
 }
 
-static struct file_operations divas_fops = {
+static const struct file_operations divas_fops = {
        .owner   = THIS_MODULE,
        .llseek  = no_llseek,
        .read    = divas_read,