Merge branch 'master' into csb1725

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

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 91917133ae0ad7de08d58a9379e943c9ecef2988..a4a6c2f044b539e8472a8398ed712e3191febac3 100644 (file)
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -155,6 +155,7 @@ static const struct file_operations bsr_fops = {
        .owner = THIS_MODULE,
        .mmap  = bsr_mmap,
        .open  = bsr_open,
+       .llseek = noop_llseek,
 };
 
 static void bsr_cleanup_devs(void)