diff --git a/src/smi_driver.c b/src/smi_driver.c
index ac1a952..7219612 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -918,8 +918,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
     pSmi->clockRange.next = NULL;
     pSmi->clockRange.minClock = 20000;
 
-    if (pSmi->Chipset == SMI_LYNX3DM ||
-	pSmi->Chipset == SMI_COUGAR3DR ||
+    if (SMI_LYNXM_SERIES(pSmi->Chipset) ||
 	IS_MSOC(pSmi))
 	pSmi->clockRange.maxClock = 200000;
     else
diff --git a/src/smilynx_output.c b/src/smilynx_output.c
index 6f34c3f..5ac0bbd 100644
--- a/src/smilynx_output.c
+++ b/src/smilynx_output.c
@@ -285,7 +285,9 @@ SMILynx_OutputPreInit(ScrnInfoPtr pScrn)
 	    SMI_OutputFuncsInit_base(&outputFuncs);
 	    outputFuncs->dpms = SMILynx_OutputDPMS_crt;
 	    outputFuncs->get_modes = SMILynx_OutputGetModes_crt;
-	    outputFuncs->detect = SMILynx_OutputDetect_crt;
+
+	    if(pSmi->Chipset == SMI_LYNX3DM)
+		outputFuncs->detect = SMILynx_OutputDetect_crt;
 
 	    if(! (output = xf86OutputCreate(pScrn,outputFuncs,"VGA")))
 		LEAVE(FALSE);