From 07afeb9435decc32aa434b5c8fbe103187543b94 Mon Sep 17 00:00:00 2001
From: Ilija Hadzic <ihadzic@research.bell-labs.com>
Date: Thu, 19 Apr 2012 12:22:20 -0400
Subject: [PATCH] --- yaml --- r: 299743 b: refs/heads/master c:
 df391c0df49560c7fceffbad5b9d083836d9f22f h: refs/heads/master i:   299741:
 7c804b8af9bc7272f82e8122a4c1eb1efb0b30e7   299739:
 4b58a10cc8b93acf9b0bd505ae07ecf3d19072d4   299735:
 c5e4002d4698ad9aebd5f0c31db650d20120ce63   299727:
 c12aa3502b8669c4eaf14d8ebd17dcdb12776657   299711:
 80f2b16bbd0a84168e04fb2be5647f8785c559ce v: v3

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

diff --git a/[refs] b/[refs]
index ea33607b5d8f..4e16aa7b26fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 792ac99c9a09dae1408617a6578ba189424a911e
+refs/heads/master: df391c0df49560c7fceffbad5b9d083836d9f22f
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_display.c b/trunk/drivers/gpu/drm/radeon/radeon_display.c
index 8086c96e0b06..0a1d4bd65edc 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_display.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_display.c
@@ -533,7 +533,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
 		radeon_legacy_init_crtc(dev, radeon_crtc);
 }
 
-static const char *encoder_names[36] = {
+static const char *encoder_names[37] = {
 	"NONE",
 	"INTERNAL_LVDS",
 	"INTERNAL_TMDS1",
@@ -570,6 +570,7 @@ static const char *encoder_names[36] = {
 	"INTERNAL_UNIPHY2",
 	"NUTMEG",
 	"TRAVIS",
+	"INTERNAL_VCE"
 };
 
 static const char *connector_names[15] = {