diff -up xf86-video-nv-2.1.6/src/nv_setup.c.jx xf86-video-nv-2.1.6/src/nv_setup.c
--- xf86-video-nv-2.1.6/src/nv_setup.c.jx	2007-09-17 17:17:51.000000000 -0400
+++ xf86-video-nv-2.1.6/src/nv_setup.c	2008-02-12 10:19:54.000000000 -0500
@@ -668,27 +668,14 @@ NVCommonSetup(ScrnInfoPtr pScrn)
        }
      
        if(monitorA) {
-           if((monitorA->features.input_type && pNv->FlatPanel) ||
-              (!monitorA->features.input_type && !pNv->FlatPanel))
-           {
-               if(monitorB) { 
-                  xfree(monitorB);
-                  monitorB = NULL;
-               }
-           } else {
-              xfree(monitorA);
-              monitorA = NULL;
-           }
+	   if(monitorB) { 
+	       xfree(monitorB);
+	       monitorB = NULL;
+	   }
        }
 
        if(monitorB) {
-           if((monitorB->features.input_type && !pNv->FlatPanel) ||
-              (!monitorB->features.input_type && pNv->FlatPanel)) 
-           {
-              xfree(monitorB);
-           } else {
-              monitorA = monitorB;
-           }
+           monitorA = monitorB;
            monitorB = NULL;
        }