diff options
| author | Eric Anholt <eric@anholt.net> | 2009-11-05 15:04:06 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-05 15:04:06 -0800 |
| 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 7f436ec075f..2fa21786205 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 = { .mmap = drm_gem_mmap, .poll = drm_poll, .fasync = drm_fasync, + .read = drm_read, #ifdef CONFIG_COMPAT .compat_ioctl = i915_compat_ioctl, #endif |