debian/changelog |    7 +++++++
 src/alp_driver.c |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 93a3d1e7a0bccea672756f9d5c630186f1f097f6
Author: Julien Cristau <[email protected]>
Date:   Sun Jan 25 21:10:20 2009 +0100

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 75dc827..debe7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.2.1-1.lenny1) unstable; urgency=high
+
+  * Cherry-pick from upstream:
+    alpine: fix order of arguments of PCI_WRITE_LONG().
+
+ -- Julien Cristau <[email protected]>  Sun, 25 Jan 2009 21:10:09 +0100
+
 xserver-xorg-video-cirrus (1:1.2.1-1) unstable; urgency=low
 
   * New upstream release.

commit 7fc4a9d2fde1c895303e311a0f39dadcff045e88
Author: Matthieu Herrb <[email protected]>
Date:   Tue Sep 16 23:48:07 2008 +0200

    alpine: fix order of arguments of PCI_WRITE_LONG().
    (cherry picked from commit d92459edcb8917d51435110f6b30a133d8ce7d52)

diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5d2426..b7be5b2 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -591,8 +591,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
         * BIOSes tend to mess them up
         */
 
-       PCI_WRITE_LONG(pCir->PciInfo, 0x10, PCI_REGION_BASE(pCir->PciInfo, 0, 
REGION_MEM));
-       PCI_WRITE_LONG(pCir->PciInfo, 0x14, PCI_REGION_BASE(pCir->PciInfo, 1, 
REGION_MEM));
+       PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, 
REGION_MEM), 0x10);
+       PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, 
REGION_MEM), 0x14);
        
     }
 


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to