xf86-video-intel: Branch 'xf86-video-intel-2.3-branch' - 2 commits - configure.ac src/i830_quirks.c

[Zhenyu Wang]

 configure.ac      |    2 +-
 src/i830_quirks.c |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f5ad42f0ceef78f6fac490bcc40d56d0ce8c9e2e
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon May 12 09:01:21 2008 +0800

    Bump version 2.3.1

diff --git a/configure.ac b/configure.ac
index 7401451..f8a3824 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.3.0,
+        2.3.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
 
commit 6fd31f94a481c3193a04d9714dfde030a00f1dcc
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon May 12 08:57:56 2008 +0800

    Revert last HP 965GM pipe A quirk
    
    Seems not resolve the issue (fdo bug #15885).
    (cherry picked from commit f280c50dd5d29c5717adc6da2368363cb3d0adbb)

diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 34c49b8..b1c1423 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -265,8 +265,6 @@ static i830_quirk i830_quirk_list[] = {
 
     /* HP Compaq 6730s has no TV output */
     { PCI_CHIP_IGD_GM, 0x103c, 0x30e8, quirk_ignore_tv },
-    /* HP Compaq 6710b hangs with lid closed and "Automatic Login"(LP: #228399)*/
-    { PCI_CHIP_I965_GM, 0x103c, 0x30c0, quirk_pipea_force },
 
     /* Thinkpad R31 needs pipe A force quirk */
     { PCI_CHIP_I830_M, 0x1014, 0x0505, quirk_pipea_force },