diff options
| author | Eric Anholt <eric@anholt.net> | 2009-11-05 18:04:06 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-05 18:04:06 -0500 |
| commit | 5b8f0be0dce012d190a53d55240fe3fde6306476 (patch) | |
| tree | 19fccf22b07730205e9b1d64e8e8f676a12b763a /drivers/gpu/drm/i915 | |
| parent | 43bcd61fae05fc6062b4f117c5adb1a72c9f8c57 (diff) | |
| parent | 4fe9676d1ae6639b5749140eba052261d363366b (diff) | |
Merge remote branch 'airlied/drm-next' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 7f436ec075f6..2fa217862058 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -333,6 +333,7 @@ static struct drm_driver driver = { | |||
| 333 | .mmap = drm_gem_mmap, | 333 | .mmap = drm_gem_mmap, |
| 334 | .poll = drm_poll, | 334 | .poll = drm_poll, |
| 335 | .fasync = drm_fasync, | 335 | .fasync = drm_fasync, |
| 336 | .read = drm_read, | ||
| 336 | #ifdef CONFIG_COMPAT | 337 | #ifdef CONFIG_COMPAT |
| 337 | .compat_ioctl = i915_compat_ioctl, | 338 | .compat_ioctl = i915_compat_ioctl, |
| 338 | #endif | 339 | #endif |