xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 configure.ac         |    2 +-
 src/atiprobe.c       |    5 ++++-
 src/r128_version.h   |    4 ++--
 src/radeon_version.h |    4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

New commits:
diff-tree 23a21d00db6f3b88b54c44648f968018a03677d3 (from c6b33db9d2c751e34c2152b0bb7e0e84a812589f)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Fri Jun 16 16:37:07 2006 +1000

    [PATCH] move the declaration of pMach64 into the correct ifndef statement
    Signed-off-by: Tilman Sauerbeck <tilman at code-monkey.de>
    Signed-off-by: Dave Airlie <airlied at linux.ie>

diff --git a/src/atiprobe.c b/src/atiprobe.c
index 5ad4cda..df74a42 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -1008,10 +1008,13 @@ ATIProbe
     int                    Chipset;
     ATIChipType            Chip;
 
+#ifndef AVOID_NON_PCI
+    ATIPtr                 pMach64[3] = {NULL, NULL, NULL};
+#endif
+
 #ifndef AVOID_CPIO
 
     ATIPtr                 pVGA = NULL, p8514 = NULL;
-    ATIPtr                 pMach64[3] = {NULL, NULL, NULL};
     pciConfigPtr           *xf86PciInfo = xf86GetPciConfigInfo();
     PortPtr                PCIPorts = NULL;
     int                    nPCIPort = 0;
diff-tree c6b33db9d2c751e34c2152b0bb7e0e84a812589f (from 9c534b5330534fc6cf392936a9b200a5128c787c)
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Jun 16 16:22:03 2006 +1000

    ati: prepare for release
    
    Update some versions for release

diff --git a/configure.ac b/configure.ac
index 3d9abb8..ca4faf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ati],
-        6.6.0,
+        6.6.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ati)
 AC_DEFINE_UNQUOTED([ATI_VERSION_MAJOR],
diff --git a/src/r128_version.h b/src/r128_version.h
index 1bdcae3..9e5f740 100644
--- a/src/r128_version.h
+++ b/src/r128_version.h
@@ -38,8 +38,8 @@
 #define R128_DRIVER_NAME   "r128"
 
 #define R128_VERSION_MAJOR 4
-#define R128_VERSION_MINOR 0
-#define R128_VERSION_PATCH 4
+#define R128_VERSION_MINOR 1
+#define R128_VERSION_PATCH 0
 
 #ifndef R128_VERSION_EXTRA
 #define R128_VERSION_EXTRA ""
diff --git a/src/radeon_version.h b/src/radeon_version.h
index 5fc41c4..ca84bdb 100644
--- a/src/radeon_version.h
+++ b/src/radeon_version.h
@@ -42,8 +42,8 @@
 
 #define RADEON_VERSION_MAJOR 4
 #define RADEON_VERSION_MAJOR_TILED 5
-#define RADEON_VERSION_MINOR 0
-#define RADEON_VERSION_PATCH 3
+#define RADEON_VERSION_MINOR 1
+#define RADEON_VERSION_PATCH 0
 
 #ifndef RADEON_VERSION_EXTRA
 #define RADEON_VERSION_EXTRA ""