From 3f569fc7d38be899d1e78737f11a7b18e167524d Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Thu, 25 Aug 2011 17:55:54 +0000 Subject: [PATCH] --- yaml --- r: 275187 b: refs/heads/master c: 0c54781bc5aaec1e23bc50a4ef757b8e8bfc693b h: refs/heads/master i: 275185: d5f1e403036377f1d22c80eab86d1779be7230c9 275183: 8d26c3ffa5ede892fc34ab6e184e55a6014af1c2 v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/drm.tmpl | 4 ++-- trunk/drivers/gpu/drm/i915/i915_drv.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 82b429662891..16b39dcdc3d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f11aca045c165b9d4c9c4fce29f51ec24bcf64d3 +refs/heads/master: 0c54781bc5aaec1e23bc50a4ef757b8e8bfc693b diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl index b9079386040d..4ddc99928668 100644 --- a/trunk/Documentation/DocBook/drm.tmpl +++ b/trunk/Documentation/DocBook/drm.tmpl @@ -88,8 +88,8 @@ 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 | diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c index ce045a8cf82c..acf4ea84c801 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.c +++ b/trunk/drivers/gpu/drm/i915/i915_drv.c @@ -785,8 +785,8 @@ static struct vm_operations_struct i915_gem_vm_ops = { }; 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 |*/