Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / crystalhd / crystalhd_lnx.c

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 115e79b8b4eb9c29a2d2e0ee7b8e46f7d207707f..28c6b8ced424cec2e2f3d54ac495f61fda6941da 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -351,6 +351,7 @@ static const struct file_operations chd_dec_fops = {
        .unlocked_ioctl = chd_dec_ioctl,
        .open    = chd_dec_open,
        .release = chd_dec_close,
+       .llseek = noop_llseek,
 };
 
 static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp)