From e04a02265b175af0aa465eef55e2d75c3c7a96ae Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon, 7 Nov 2011 12:03:16 -0800
Subject: [PATCH] --- yaml --- r: 282472 b: refs/heads/master c:
 6c3db9200b75f0fd736c9d766b754b971ad07eb1 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/drm/drm_crtc.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index db3fb0fa691f..f24e6fc2a99e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7749163efe5b366d53a3609229263c7a7994a8df
+refs/heads/master: 6c3db9200b75f0fd736c9d766b754b971ad07eb1
diff --git a/trunk/include/drm/drm_crtc.h b/trunk/include/drm/drm_crtc.h
index 9014599791a5..7db2ce52c5a4 100644
--- a/trunk/include/drm/drm_crtc.h
+++ b/trunk/include/drm/drm_crtc.h
@@ -437,6 +437,13 @@ struct drm_connector_funcs {
 	void (*force)(struct drm_connector *connector);
 };
 
+/**
+ * drm_encoder_funcs - encoder controls
+ * @reset: reset state (e.g. at init or resume time)
+ * @destroy: cleanup and free associated data
+ *
+ * Encoders sit between CRTCs and connectors.
+ */
 struct drm_encoder_funcs {
 	void (*reset)(struct drm_encoder *encoder);
 	void (*destroy)(struct drm_encoder *encoder);