xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ff323e11485fa5030ac278c836bf80a535c22249
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Mar 26 01:24:16 2010 -0400

    radeon: fix name string for eDP

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 7b28523..16b3406 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -86,7 +86,7 @@ const char *encoder_name[34] = {
     "INTERNAL_UNIPHY2",
 };
 
-const char *ConnectorTypeName[17] = {
+const char *ConnectorTypeName[18] = {
   "None",
   "VGA",
   "DVI-I",
@@ -103,6 +103,7 @@ const char *ConnectorTypeName[17] = {
   "Unsupported",
   "DIN",
   "DisplayPort",
+  "eDP",
   "Unsupported"
 };