commit 6e375f44b6073dd320895753ff05cbfd3f410f66
author Michael Witten <mfwitten@gmail.com> Thu Aug 25 18:37:05 2011 +0000
committer Michael Witten <mfwitten@gmail.com> Mon Aug 29 19:30:45 2011 +0000
tree 0edeccb295cde0b789ff79648db1b37b92e2f7c3
parent 75aa9df5a2bf2ae90a1f0f6f283278f634ca4233

DocBook/drm: Replace the paragraph's first sentence with its last sentence

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Documentation/DocBook/drm.tmpl

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index eb28cc0..9eda9b6d 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -269,8 +269,10 @@
       initial output configuration.
     </para>
     <para>
-      Note that the tasks performed at driver load time must not
-      conflict with DRM client requirements.  For instance, if user
+      If compatibility is a concern (e.g. with drivers converted over
+      to the new interfaces from the old ones), care must be taken to
+      prevent device initialization and control that is incompatible with
+      currently active userspace drivers.  For instance, if user
       level mode setting drivers are in use, it would be problematic
       to perform output discovery &amp; configuration at load time.
       Likewise, if user-level drivers unaware of memory management are
@@ -279,11 +281,7 @@
       needs to be taken to keep both old and new applications and
       libraries working.  The i915 driver supports the "modeset"
       module parameter to control whether advanced features are
-      enabled at load time or in legacy fashion.  If compatibility is
-      a concern (e.g. with drivers converted over to the new interfaces
-      from the old ones), care must be taken to prevent device
-      initialization and control that is incompatible with
-      currently active userspace drivers.
+      enabled at load time or in legacy fashion.
     </para>
 
     <sect2>