diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-09-22 18:03:39 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-09-22 18:03:39 -0700 |
| commit | d18b86aa7fc9270e24ed9ea861ebbbbb54558fee (patch) | |
| tree | a8ecddbb0f478ffc9ed2e79ca42c556a5e276c06 | |
| parent | 9a7da65e624060a37eef989963a9c79f13df30d3 (diff) | |
| parent | 6a46022df57d09109fc119fedce99c156715a4d4 (diff) | |
Merge branch 'master' into xf86-video-intel-2.5-branch
| -rw-r--r-- | src/i830_quirks.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/i830_quirks.c b/src/i830_quirks.c index 089e458f..528b5646 100644 --- a/src/i830_quirks.c +++ b/src/i830_quirks.c @@ -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 }, |