Merge branch 'master' into xf86-video-intel-2.5-branch

This commit is contained in:
Jesse Barnes 2008-09-22 18:03:39 -07:00
commit d18b86aa7f
1 changed files with 5 additions and 0 deletions

View File

@ -229,6 +229,9 @@ static i830_quirk i830_quirk_list[] = {
{ PCI_CHIP_I965_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds },
{ PCI_CHIP_I965_GM, 0x8086, 0x1999, quirk_ignore_lvds },
/* Cappuccino SlimPRO SP625F, bz #11368 */
{ PCI_CHIP_I855_GM, 0x8086, 0x3582, quirk_ignore_lvds },
/* Apple Mac mini has no lvds, but macbook pro does */
{ PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini },
@ -278,6 +281,8 @@ static i830_quirk i830_quirk_list[] = {
/* Samsung Q45 has no TV output */
{ PCI_CHIP_I965_GM, 0x144d, 0xc510, quirk_ignore_tv },
/* HP Compaq nx6110 has no TV output */
{ PCI_CHIP_I915_GM, 0x103c, 0x099c, quirk_ignore_tv },
/* HP Compaq 6730s has no TV output */
{ PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv },