Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpu / vga / vgaarb.c

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index f366f968155a3ed913ce770a60ca30cbf2f97981..c380c65da41798faf91b9e730f585be97a7b49d6 100644 (file)
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -1211,6 +1211,7 @@ static const struct file_operations vga_arb_device_fops = {
        .poll = vga_arb_fpoll,
        .open = vga_arb_open,
        .release = vga_arb_release,
+       .llseek = noop_llseek,
 };
 
 static struct miscdevice vga_arb_device = {