Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / gpu / drm / r128 / r128_drv.c

diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 1e2971f13aa1f5775f518db92967c5c5a6c83ddf..18c3c71e41b1cc37c94477d052b7959085fe0ebd 100644 (file)
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -56,8 +56,6 @@ static struct drm_driver driver = {
        .irq_uninstall = r128_driver_irq_uninstall,
        .irq_handler = r128_driver_irq_handler,
        .reclaim_buffers = drm_core_reclaim_buffers,
-       .get_map_ofs = drm_core_get_map_ofs,
-       .get_reg_ofs = drm_core_get_reg_ofs,
        .ioctls = r128_ioctls,
        .dma_ioctl = r128_cce_buffers,
        .fops = {
@@ -71,6 +69,7 @@ static struct drm_driver driver = {
 #ifdef CONFIG_COMPAT
                .compat_ioctl = r128_compat_ioctl,
 #endif
+               .llseek = noop_llseek,
        },
        .pci_driver = {
                .name = DRIVER_NAME,