diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2011-11-07 00:40:22 -0500 |
|---|---|---|
| committer | Randy Dunlap <rdunlap@xenotime.net> | 2011-11-07 00:40:22 -0500 |
| commit | 5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36 (patch) | |
| tree | 806068fd67093b7d653972d2627c4e6f479f25a5 /drivers/gpu | |
| parent | b32fc0a0629bf5894b35f33554c118aacfd0d1e2 (diff) | |
| parent | bcd3cfc1213894ff955771508d46fa18d66e9328 (diff) | |
Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
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 = { | |||
| 789 | }; | 789 | }; |
| 790 | 790 | ||
| 791 | static struct drm_driver driver = { | 791 | static struct drm_driver driver = { |
| 792 | /* don't use mtrr's here, the Xserver or user space app should | 792 | /* Don't use MTRRs here; the Xserver or userspace app should |
| 793 | * deal with them for intel hardware. | 793 | * deal with them for Intel hardware. |
| 794 | */ | 794 | */ |
| 795 | .driver_features = | 795 | .driver_features = |
| 796 | DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ | 796 | DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ |