xserver-xorg-video-glint: Changes to 'upstream-experimental'

[Julien Cristau <jcristau@alioth.debian.org>]

 configure.ac       |    2 +-
 src/glint_driver.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a68acd796e14742615eb071819b2910f69346a2b
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Jun 30 17:56:27 2008 +0200

    Bump to 1.2.1

diff --git a/configure.ac b/configure.ac
index aa46117..238e5b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-glint],
-        1.2.0,
+        1.2.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-glint)
 

commit 9c4f5ec0c8a5b48b9b923798175cc6e66932f8ed
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Jun 24 03:17:32 2008 +0200

    Fix regression from pciaccess conversion (bug#16060)

diff --git a/src/glint_driver.c b/src/glint_driver.c
index eb375ec..47127f9 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -1408,7 +1408,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
 	pGlint->IOAddress = pGlint->pEnt->device->IOBase;
 	from = X_CONFIG;
     } else {
-	pGlint->IOAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
+	pGlint->IOAddress = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM) & 0xFFFFC000;
     }
 
     if ((IS_J2000) && (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {