diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 09:58:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 09:58:47 -0700 |
| commit | cc14cf46da215a9df1c0a4388763a68769ef9e53 (patch) | |
| tree | f9add6f7ae53b4155a22fd8afc20c847fda021fb /drivers/char/drm/i915_drv.c | |
| parent | 4cda1fd78781c31e2a3d9dd87ee05d39cb76b3f9 (diff) | |
| parent | 8ca7c1df08210fd35fccf1559837c92baaa4da8f (diff) | |
Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/i915_drv.c')
| -rw-r--r-- | drivers/char/drm/i915_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c index e6a9e1d1d28..6a6cc3c0c4c 100644 --- 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, |