xf86-video-intel: Branch 'xf86-video-intel-2.5-branch' - 3 commits -

[Jesse Barnes]

 0 files changed

New commits:
commit 8408995ffbf705aa0bc09ab72c58c2e31a4b70c3
Merge: d18b86a... afa630b...
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Sep 22 18:38:54 2008 -0700

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

commit afa630b448e5993850433c9f0b129758ec4d37b5
Author: Bryce Harrington <bryce at canonical.com>
Date:   Mon Sep 22 18:38:35 2008 -0700

    Add TV out quirk for HP Compaq nx6110
    
    Adds a TV out quirk for HP Compaq nx6110.  Fixes bz #17683.

diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index a3b2386..528b564 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -281,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 },
 
commit 204a6281aa59e29027793ba5c84a5d9af7dc9e90
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Sep 22 18:38:03 2008 -0700

    Revert "Add no TV out quirk for HP Compaq nx6110"
    
    This reverts commit 6a46022df57d09109fc119fedce99c156715a4d4.  It should have
    been attributed to Bryce.

diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 528b564..a3b2386 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -281,8 +281,6 @@ 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 },