From ddf89f2634911aa2fa63f6845b1834d5224eb077 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Thu, 25 Aug 2011 20:29:32 +0000 Subject: [PATCH] --- yaml --- r: 275217 b: refs/heads/master c: 4dc0152d5780f04573046b06a3fb7c7ad9b81afa h: refs/heads/master i: 275215: 7d8c8e5aaaad7a1903edfb6ec932605bccd71a74 v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/drm.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6dca5cbc50dc..3f81e25659ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 896ee65fb646f9a98243a9f69e5904dff394c78a +refs/heads/master: 4dc0152d5780f04573046b06a3fb7c7ad9b81afa diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl index d2aee84f18af..09e02f7c668c 100644 --- a/trunk/Documentation/DocBook/drm.tmpl +++ b/trunk/Documentation/DocBook/drm.tmpl @@ -573,8 +573,8 @@ void intel_crt_init(struct drm_device *dev) Since many PC-class graphics devices have similar display output designs, the DRM provides a set of helper functions to make output management easier. The core helper routines handle - encoder re-routing and disabling of unused functions following - mode set. Using the helpers is optional, but recommended for + encoder re-routing and the disabling of unused functions following + mode setting. Using the helpers is optional, but recommended for devices with PC-style architectures (i.e. a set of display planes for feeding pixels to encoders which are in turn routed to connectors). Devices with more complex requirements needing