Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[safe/jmp/linux-2.6] / drivers / char / drm / i915_drv.c

diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index f0a0c5b..1f59d3f 100644 (file)
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -97,6 +97,9 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
+#ifdef CONFIG_COMPAT
+               .compat_ioctl = i915_compat_ioctl,
+#endif
        },
        .pci_driver = {
                .name          = DRIVER_NAME,