summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2011-11-06 21:40:22 -0800
committerRandy Dunlap <rdunlap@xenotime.net>2011-11-06 21:40:22 -0800
commit5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36 (patch)
tree806068fd67093b7d653972d2627c4e6f479f25a5 /drivers
parentb32fc0a0629bf5894b35f33554c118aacfd0d1e2 (diff)
parentbcd3cfc1213894ff955771508d46fa18d66e9328 (diff)
Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index cc531bb59c2..e9c2cfe45da 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -789,8 +789,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 |*/