Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / drivers / char / briq_panel.c

diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index b8c22255f6ada92615b2e70d8ad717927e04c9ae..8dcf9d20f44985be7cbf707bee14e5e20af6a077 100644 (file)
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
@@ -8,10 +8,8 @@
 
 #include <linux/types.h>
 #include <linux/errno.h>
-#include <linux/sched.h>
 #include <linux/tty.h>
 #include <linux/timer.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/wait.h>
 #include <linux/string.h>
@@ -188,7 +186,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
        return len;
 }
 
-static struct file_operations briq_panel_fops = {
+static const struct file_operations briq_panel_fops = {
        .owner          = THIS_MODULE,
        .read           = briq_panel_read,
        .write          = briq_panel_write,