Set MODULE_VERSION() in drm drivers to
DRIVER_MAJOR.DRIVER_MINOR.DRIVER_PATCHLEVEL, so that the module
version can be checked e.g. with modinfo.
Signed-off-by: Anssi Hannula <[EMAIL PROTECTED]>
---
drivers/char/drm/drmP.h | 4 ++++
drivers/char/drm/drm_stub.c | 1 +
drivers/char/drm/i810_drv.c | 1 +
drivers/char/drm/i830_drv.c | 1 +
drivers/char/drm/i915_drv.c | 1 +
drivers/char/drm/mga_drv.c | 1 +
drivers/char/drm/r128_drv.c | 1 +
drivers/char/drm/radeon_drv.c | 1 +
drivers/char/drm/savage_drv.c | 1 +
drivers/char/drm/sis_drv.c | 1 +
drivers/char/drm/tdfx_drv.c | 1 +
drivers/char/drm/via_drv.c | 1 +
12 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index dde02a1..27c5ef2 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -72,6 +72,7 @@
#endif
#include <linux/workqueue.h>
#include <linux/poll.h>
+#include <linux/stringify.h>
#include <asm/pgalloc.h>
#include "drm.h"
@@ -217,6 +218,9 @@ struct drm_device;
#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
+
+#define DRM_VERSTRING(maj, min, pl) \
+ __stringify(maj) "." __stringify(min) "." __stringify(pl)
/**
* Get the private SAREA mapping.
*
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index ee83ff9..b9a7782 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -43,6 +43,7 @@ EXPORT_SYMBOL(drm_debug);
MODULE_AUTHOR(CORE_AUTHOR);
MODULE_DESCRIPTION(CORE_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL));
MODULE_PARM_DESC(cards_limit, "Maximum number of graphics cards");
MODULE_PARM_DESC(debug, "Enable debug output");
diff --git a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c
index fabb9a8..80a3777 100644
--- a/drivers/char/drm/i810_drv.c
+++ b/drivers/char/drm/i810_drv.c
@@ -95,3 +95,4 @@ module_exit(i810_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c
index 389597e..97cc5a3 100644
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/char/drm/i830_drv.c
@@ -106,3 +106,4 @@ module_exit(i830_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index 85bcc27..9fab397 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -103,3 +103,4 @@ module_exit(i915_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
index 5572939..4c12aab 100644
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -105,6 +105,7 @@ module_exit(mga_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
/**
* Determine if the device really is AGP or not.
diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c
index 6108e75..2792f5f 100644
--- a/drivers/char/drm/r128_drv.c
+++ b/drivers/char/drm/r128_drv.c
@@ -101,3 +101,4 @@ module_exit(r128_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c
index 349ac3d..26600a7 100644
--- a/drivers/char/drm/radeon_drv.c
+++ b/drivers/char/drm/radeon_drv.c
@@ -124,3 +124,4 @@ module_exit(radeon_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/savage_drv.c b/drivers/char/drm/savage_drv.c
index eee52aa..d8fd94e 100644
--- a/drivers/char/drm/savage_drv.c
+++ b/drivers/char/drm/savage_drv.c
@@ -86,3 +86,4 @@ module_exit(savage_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/sis_drv.c b/drivers/char/drm/sis_drv.c
index 7dacc64..c0b215d 100644
--- a/drivers/char/drm/sis_drv.c
+++ b/drivers/char/drm/sis_drv.c
@@ -115,3 +115,4 @@ module_exit(sis_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/tdfx_drv.c b/drivers/char/drm/tdfx_drv.c
index 012ff2e..7529b9a 100644
--- a/drivers/char/drm/tdfx_drv.c
+++ b/drivers/char/drm/tdfx_drv.c
@@ -82,3 +82,4 @@ module_exit(tdfx_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
diff --git a/drivers/char/drm/via_drv.c b/drivers/char/drm/via_drv.c
index 2d4957a..111dc3f 100644
--- a/drivers/char/drm/via_drv.c
+++ b/drivers/char/drm/via_drv.c
@@ -98,3 +98,4 @@ module_exit(via_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL and additional rights");
+MODULE_VERSION(DRM_VERSTRING(DRIVER_MAJOR, DRIVER_MINOR, DRIVER_PATCHLEVEL));
--
Anssi Hannula
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
