Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / frontier / tranzport.c

diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index cde02839258a723d5c520196c22b5df540a5ae30..a145a15cfdb39d865a62200a83298192f2670098 100644 (file)
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -767,6 +767,7 @@ static const struct file_operations usb_tranzport_fops = {
        .open = usb_tranzport_open,
        .release = usb_tranzport_release,
        .poll = usb_tranzport_poll,
+       .llseek = no_llseek,
 };
 
 /*