Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[~andy/linux] / arch / x86 / kernel / apm_32.c

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 9fed1cc7ba9010a3874ef14eb48fdc5075608151..0e4f24c2a746f11b21ec534db5180c50e0d69cbd 100644 (file)
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1926,6 +1926,7 @@ static const struct file_operations apm_bios_fops = {
        .unlocked_ioctl = do_ioctl,
        .open           = do_open,
        .release        = do_release,
+       .llseek         = noop_llseek,
 };
 
 static struct miscdevice apm_device = {