summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2011-11-07 06:40:22 +0100
committerRandy Dunlap <rdunlap@xenotime.net>2011-11-07 06:40:22 +0100
commit5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36 (patch)
tree806068fd67093b7d653972d2627c4e6f479f25a5 /drivers
parentMerge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/li... (diff)
parentDocBook/drm: Clean up a todo-note (diff)
downloadlinux-5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36.tar.xz
linux-5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36.zip
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 cc531bb59c26..e9c2cfe45daa 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 |*/