diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2007-01-07 22:37:40 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-01-07 22:37:40 -0800 |
| commit | c5aaf7648df82665851c9e67f5509b427ca34c8e (patch) | |
| tree | 55b317738a99097cb02ba6a736b9ef20de6b34f3 /shared-core/i915_drv.h | |
| parent | 63c0f3946056d044b7c5688fa5cb670782212c77 (diff) | |
| parent | d0080d71b9f3df0d4f743324b7e8f1ce580bdcaf (diff) | |
Merge branch 'master' into crestline
Conflicts:
shared-core/i915_drm.h
Whitespace change only
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 85804ce7..98f58940 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -35,7 +35,7 @@ #define DRIVER_AUTHOR "Tungsten Graphics, Inc." -#define DRIVER_NAME "i915-mm" +#define DRIVER_NAME "i915" #define DRIVER_DESC "Intel Graphics" #define DRIVER_DATE "20060929" @@ -48,9 +48,10 @@ * 1.5: Add vblank pipe configuration * 1.6: - New ioctl for scheduling buffer swaps on vertical blank * - Support vertical blank on secondary display pipe + * 1.8: New ioctl for ARB_Occlusion_Query */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 7 +#define DRIVER_MINOR 8 #define DRIVER_PATCHLEVEL 0 #if defined(__linux__) |