Merge git://git.infradead.org/battery-2.6

[~andy/linux] / drivers / gpu / drm / i830 / i830_drv.c

diff --git a/drivers/gpu/drm/i830/i830_drv.c b/drivers/gpu/drm/i830/i830_drv.c
index a5c66aa82f0c1cd9246b8ea3c66c29f0bc7cd1e2..5b6298b24e249960bcf6053cb4d29c4573a285d3 100644 (file)
--- a/drivers/gpu/drm/i830/i830_drv.c
+++ b/drivers/gpu/drm/i830/i830_drv.c
@@ -74,6 +74,7 @@ static struct drm_driver driver = {
                 .mmap = drm_mmap,
                 .poll = drm_poll,
                 .fasync = drm_fasync,
+                .llseek = noop_llseek,
        },
 
        .pci_driver = {