xf86-video-ati: Branch 'atom-tvout'

[Dave Airlie]

 src/atombios_output.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b9549e89cbdf8fff4aa7bd9f3adfb7d5732508cc
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 17 11:40:53 2008 +1000

    atombios: re-enable TV dpms

diff --git a/src/atombios_output.c b/src/atombios_output.c
index 945cefc..3030a10 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -845,8 +845,8 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
 	/*ErrorF("AGD: cv dpms\n");*/
 	if (radeon_output->devices & ATOM_DEVICE_CV_SUPPORT)
 	    atombios_device_dpms(output, ATOM_DEVICE_CV_SUPPORT, mode);
-    } else if (0 /*radeon_output->MonType == MT_STV ||
-		   radeon_output->MonType == MT_CTV*/) {
+    } else if (radeon_output->MonType == MT_STV ||
+	       radeon_output->MonType == MT_CTV) {
 	/*ErrorF("AGD: tv dpms\n");*/
 	if (radeon_output->devices & ATOM_DEVICE_TV1_SUPPORT)
 	    atombios_device_dpms(output, ATOM_DEVICE_TV1_SUPPORT, mode);