Merge branch 'master' of git+ssh://xorg.freedesktop.org/git/xorg/driver/xf86-video-intel

This commit is contained in:
Alan Hourihane 2006-08-08 11:07:56 +01:00
commit e4f63eaf5e
5 changed files with 5 additions and 3 deletions

View File

@ -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)

View File

@ -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 */

View File

@ -29,6 +29,7 @@
#include "config.h"
#endif
#include "xf86.h"
#include "i830.h"
#include "i830_reg.h"

View File

@ -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

View File

@ -29,6 +29,7 @@
#include "config.h"
#endif
#include "xf86.h"
#include "i830.h"
#include "i915_reg.h"