Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index d5fa113afe37..095ab90535ce 100644
--- 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 = {