Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

[~andy/linux] / drivers / char / sx.c

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 5b24db4ff7f102f1b2af7b154f1690cf71b29c39..a786326cea2f38163c343ff77997d2c2322c5e5b 100644 (file)
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -216,7 +216,6 @@
 #include <linux/eisa.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/bitops.h>
@@ -397,6 +396,7 @@ static struct real_driver sx_real_driver = {
 static const struct file_operations sx_fw_fops = {
        .owner = THIS_MODULE,
        .unlocked_ioctl = sx_fw_ioctl,
+       .llseek = noop_llseek,
 };
 
 static struct miscdevice sx_fw_device = {