Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / tidspbridge / rmgr / drv_interface.c

diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 1981e461edf4cd099100fd32a1af00bd41f00b37..34be43fec044da6ed15e3370c7c64963772f7454 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -143,6 +143,7 @@ static const struct file_operations bridge_fops = {
        .release = bridge_release,
        .unlocked_ioctl = bridge_ioctl,
        .mmap = bridge_mmap,
+       .llseek = noop_llseek,
 };
 
 #ifdef CONFIG_PM