Merge branch 'modesetting' into crestline

Use new TV output condition (all 9xx except 915g)
This commit is contained in:
Keith Packard 2006-12-01 10:57:16 -08:00
commit 8ddbc26b27
1 changed files with 1 additions and 1 deletions

View File

@ -709,7 +709,7 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
} else {
i830_dvo_init(pScrn);
}
if (IS_I915GM(pI830) || IS_I945GM(pI830) || IS_I965G(pI830))
if (IS_I9XX(pI830) && !IS_I915G(pI830))
i830_tv_init(pScrn);
}