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

[mv-sheeva.git] / drivers / char / apm-emulation.c

diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index 6a420baea2680ee9ef2c611f3ad1c56c1660a7a5..3022801669b148b35bc9174c19a7bbf559ec7cd6 100644 (file)
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -403,6 +403,7 @@ static const struct file_operations apm_bios_fops = {
        .unlocked_ioctl = apm_ioctl,
        .open           = apm_open,
        .release        = apm_release,
+       .llseek         = noop_llseek,
 };
 
 static struct miscdevice apm_device = {