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

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

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 598d278db0588137138cdebfa533ce508114c2ba..97c3edb95ae747a3ff2832f48e6daf098fad83bf 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -749,6 +749,7 @@ static const struct file_operations lp_fops = {
 #ifdef CONFIG_PARPORT_1284
        .read           = lp_read,
 #endif
+       .llseek         = noop_llseek,
 };
 
 /* --- support for console on the line printer ----------------- */