Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / char / briq_panel.c

diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index d5fa113afe3729760b00b5ee6cd048d20a169c27..095ab90535cea7519cce26cdc948a48c38dec02f 100644 (file)
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
@@ -6,7 +6,6 @@
 
 #include <linux/module.h>
 
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/tty.h>
@@ -186,6 +185,7 @@ static const struct file_operations briq_panel_fops = {
        .write          = briq_panel_write,
        .open           = briq_panel_open,
        .release        = briq_panel_release,
+       .llseek         = noop_llseek,
 };
 
 static struct miscdevice briq_panel_miscdev = {