diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-08 11:07:56 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-08 11:07:56 +0100 |
| commit | e4f63eaf5efb654121db148f2f8e32cc3b23b6b5 (patch) | |
| tree | 528dcb54f114c29696159f16ed96d8151d395723 | |
| parent | 633a683a4adcb9a44a54519fd7ff66aab2d12f97 (diff) | |
| parent | e26f3e30b30a57ab4aad0267d689a9a5d7a5e877 (diff) | |
Merge branch 'master' of git+ssh://xorg.freedesktop.org/git/xorg/driver/xf86-video-intelmergedfb
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/i810.h | 2 | ||||
| -rw-r--r-- | src/i830_3d.c | 1 | ||||
| -rw-r--r-- | src/i830_dri.h | 2 | ||||
| -rw-r--r-- | src/i915_3d.c | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 82d3e55f..b1d3524f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i810], - 1.6.0, + 1.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i810) @@ -66,7 +66,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define I810_DRIVER_NAME "i810" #define I810_MAJOR_VERSION 1 #define I810_MINOR_VERSION 6 -#define I810_PATCHLEVEL 0 +#define I810_PATCHLEVEL 1 /* HWMC Surfaces */ diff --git a/src/i830_3d.c b/src/i830_3d.c index 0efd6e43..debad7c9 100644 --- a/src/i830_3d.c +++ b/src/i830_3d.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#include "xf86.h" #include "i830.h" #include "i830_reg.h" diff --git a/src/i830_dri.h b/src/i830_dri.h index 4f356d1f..31232b80 100644 --- a/src/i830_dri.h +++ b/src/i830_dri.h @@ -10,7 +10,7 @@ #define I830_MAJOR_VERSION 1 #define I830_MINOR_VERSION 6 -#define I830_PATCHLEVEL 0 +#define I830_PATCHLEVEL 1 #define I830_REG_SIZE 0x80000 diff --git a/src/i915_3d.c b/src/i915_3d.c index d8edb181..b1f30ef2 100644 --- a/src/i915_3d.c +++ b/src/i915_3d.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#include "xf86.h" #include "i830.h" #include "i915_reg.h" |