From db1b22e2de903c41ece86166a0c73ae8bcbc5796 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 23 Jan 2012 16:14:05 -0800
Subject: [PATCH] --- yaml --- r: 286847 b: refs/heads/master c:
 fff24e21e17e438bf24791ed9cea7bbc02ad2dbb h: refs/heads/master i:   286845:
 5c9c2302d37dbccc15e13d6ba30e1c1c7603fbe0   286843:
 b13d8bbc5827d2e36959bc7b45369287161e8817   286839:
 f598fb5f39b249ee68d0ce8ea2c01447a27d0d08   286831:
 33adcec9394350175f4cacc7a053b1f979649f14   286815:
 c682c0d9637f683ab55fc6f443c5a3a61de3e446   286783:
 6fa2a1c3b5319fbc8f377e5598d02031a2f33031   286719:
 66d4c0fd3b051803633a7e1f7e2fb3b66e0c2fe6 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 645a4de5ff52..106e9e10f7f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f0fc977f58c36e75e205486c1aebb9b8e4263e1
+refs/heads/master: fff24e21e17e438bf24791ed9cea7bbc02ad2dbb
diff --git a/trunk/drivers/gpu/drm/i915/i915_debugfs.c b/trunk/drivers/gpu/drm/i915/i915_debugfs.c
index a017b989b1ab..60dcee3eda44 100644
--- a/trunk/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/trunk/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1106,7 +1106,7 @@ static int gen6_drpc_info(struct seq_file *m)
 	seq_printf(m, "SW control enabled: %s\n",
 		   yesno((rpmodectl1 & GEN6_RP_MEDIA_MODE_MASK) ==
 			  GEN6_RP_MEDIA_SW_MODE));
-	seq_printf(m, "RC6 Enabled: %s\n",
+	seq_printf(m, "RC1e Enabled: %s\n",
 		   yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));
 	seq_printf(m, "RC6 Enabled: %s\n",
 		   yesno(rcctl1 & GEN6_RC_CTL_RC6_ENABLE));