From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 2 Dec 2011 01:11:46 +0000 (+1100)
Subject: Merge remote-tracking branch 'drm/drm-next'
X-Git-Tag: next-20111202~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d0025061d63fd184d518af3ac23bb8808013f7d1;p=karo-tx-linux.git

Merge remote-tracking branch 'drm/drm-next'
---

d0025061d63fd184d518af3ac23bb8808013f7d1
diff --cc drivers/gpu/drm/i915/i915_drv.c
index 15bfa9145d2b,9f592703c369..14ee75d4bb8f
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -788,9 -788,24 +788,24 @@@ static struct vm_operations_struct i915
  	.close = drm_gem_vm_close,
  };
  
+ static const struct file_operations i915_driver_fops = {
+ 	.owner = THIS_MODULE,
+ 	.open = drm_open,
+ 	.release = drm_release,
+ 	.unlocked_ioctl = drm_ioctl,
+ 	.mmap = drm_gem_mmap,
+ 	.poll = drm_poll,
+ 	.fasync = drm_fasync,
+ 	.read = drm_read,
+ #ifdef CONFIG_COMPAT
+ 	.compat_ioctl = i915_compat_ioctl,
+ #endif
+ 	.llseek = noop_llseek,
+ };
+ 
  static struct drm_driver driver = {
 -	/* don't use mtrr's here, the Xserver or user space app should
 -	 * deal with them for intel hardware.
 +	/* Don't use MTRRs here; the Xserver or userspace app should
 +	 * deal with them for Intel hardware.
  	 */
  	.driver_features =
  	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/