Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[linux-flexiantxendom0-3.2.10.git] / drivers / scsi / mpt2sas / mpt2sas_ctl.c

diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 31cf126..40cb8ae 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -2953,6 +2953,7 @@ static const struct file_operations ctl_fops = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl = _ctl_ioctl_compat,
 #endif
+       .llseek = noop_llseek,
 };
 
 static struct miscdevice ctl_dev = {