diff options
| -rw-r--r-- | shared-core/via_drm.h | 11 | ||||
| -rw-r--r-- | shared-core/via_drv.c | 8 | ||||
| -rw-r--r-- | shared-core/via_drv.h | 5 |
3 files changed, 11 insertions, 13 deletions
diff --git a/shared-core/via_drm.h b/shared-core/via_drm.h index cb054667..dbaf857b 100644 --- a/shared-core/via_drm.h +++ b/shared-core/via_drm.h @@ -31,6 +31,7 @@ #ifndef _VIA_DEFINES_ #define _VIA_DEFINES_ + #if !defined(__KERNEL__) && !defined(_KERNEL) #include "via_drmclient.h" #endif @@ -39,12 +40,14 @@ * With the arrival of libdrm there is a need to version this file. * As usual, bump MINOR for new features, MAJOR for changes that create * backwards incompatibilities, (which should be avoided whenever possible). - * Note that the actual driver version is different, and defined in via_drv.h. */ -#define VIA_DRMH_MAJOR 1 -#define VIA_DRMH_MINOR 0 -#define VIA_DRMH_PATCHLEVEL 0 +#define VIA_DRM_DRIVER_DATE "20060111" + +#define VIA_DRM_DRIVER_MAJOR 2 +#define VIA_DRM_DRIVER_MINOR 9 +#define VIA_DRM_DRIVER_PATCHLEVEL 1 +#define VIA_DRM_DRIVER_VERSION (((VIA_DRM_DRIVER_MAJOR) << 16) | (VIA_DRM_DRIVER_MINOR)) #define VIA_NR_SAREA_CLIPRECTS 8 #define VIA_NR_XVMC_PORTS 10 diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c index 58638162..2dc72ec1 100644 --- a/shared-core/via_drv.c +++ b/shared-core/via_drv.c @@ -77,10 +77,10 @@ static struct drm_driver driver = { .name = DRIVER_NAME, .desc = DRIVER_DESC, - .date = DRIVER_DATE, - .major = DRIVER_MAJOR, - .minor = DRIVER_MINOR, - .patchlevel = DRIVER_PATCHLEVEL, + .date = VIA_DRM_DRIVER_DATE, + .major = VIA_DRM_DRIVER_MAJOR, + .minor = VIA_DRM_DRIVER_MINOR, + .patchlevel = VIA_DRM_DRIVER_PATCHLEVEL }; static int probe(struct pci_dev *pdev, const struct pci_device_id *ent) diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h index 11a61167..4508b04c 100644 --- a/shared-core/via_drv.h +++ b/shared-core/via_drv.h @@ -28,11 +28,6 @@ #define DRIVER_NAME "via" #define DRIVER_DESC "VIA Unichrome / Pro" -#define DRIVER_DATE "20060111" - -#define DRIVER_MAJOR 2 -#define DRIVER_MINOR 9 -#define DRIVER_PATCHLEVEL 0 #include "via_verifier.h" |