xserver-xorg-video-sis: Changes to 'debian-unstable'

[Tormod Volden <tormod-guest@alioth.debian.org>]

 debian/changelog |    7 +++++++
 src/sis_driver.c |    2 ++
 2 files changed, 9 insertions(+)

New commits:
commit 94a59e5aee8259baca57479561185e2970115b2d
Author: Tormod Volden <debian.tormod@gmail.com>
Date:   Mon Mar 22 23:10:46 2010 +0100

    Update changelog with previous cherry-pick

diff --git a/debian/changelog b/debian/changelog
index f12672b..63b3dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-sis (1:0.10.2-3) unstable; urgency=low
+
+  * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
+    Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Mon, 22 Mar 2010 22:30:07 +0100
+
 xserver-xorg-video-sis (1:0.10.2-2) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no

commit 0b6e1ce4d753617ba2e1e579f9c731a2df6ca2fe
Author: Matteo Delfino <kendatsuba@gmail.com>
Date:   Wed Oct 21 10:26:45 2009 -0400

    Fix BIOS read on 650 and 760. (#19070)
    
    Signed-off-by: Matteo Delfino <kendatsuba@gmail.com>
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    (cherry picked from commit 8370499d4035ec7a5c8e1f1b04d5a6c404883442)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index 994b02d..b19e7a9 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 	     case SIS_315H:
 	     case SIS_330:
 	     case SIS_340:
+	     case SIS_650:
+	     case SIS_760:
 	     case XGI_40:     readpci = TRUE;
 			      break;
 	     case XGI_20:     readpci = TRUE;