ChangeSet 1.2199.17.8, 2005/03/27 17:17:28+10:00, [EMAIL PROTECTED](none)
drm: change DRIVER_ to CORE_
Change some defines to better naming.
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
drm_core.h | 14 +++++++-------
drm_drv.c | 12 ++----------
drm_stub.c | 4 ++--
drm_sysfs.c | 4 ++--
4 files changed, 13 insertions(+), 21 deletions(-)
diff -Nru a/drivers/char/drm/drm_core.h b/drivers/char/drm/drm_core.h
--- a/drivers/char/drm/drm_core.h 2005-03-27 12:05:35 -08:00
+++ b/drivers/char/drm/drm_core.h 2005-03-27 12:05:35 -08:00
@@ -20,15 +20,15 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
-#define DRIVER_AUTHOR "Gareth Hughes, Leif Delgass, José Fonseca,
Jon Smirl"
+#define CORE_AUTHOR "Gareth Hughes, Leif Delgass, José Fonseca,
Jon Smirl"
-#define DRIVER_NAME "drm"
-#define DRIVER_DESC "DRM shared core routines"
-#define DRIVER_DATE "20040925"
+#define CORE_NAME "drm"
+#define CORE_DESC "DRM shared core routines"
+#define CORE_DATE "20040925"
#define DRM_IF_MAJOR 1
#define DRM_IF_MINOR 2
-#define DRIVER_MAJOR 1
-#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 0
+#define CORE_MAJOR 1
+#define CORE_MINOR 0
+#define CORE_PATCHLEVEL 0
diff -Nru a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
--- a/drivers/char/drm/drm_drv.c 2005-03-27 12:05:35 -08:00
+++ b/drivers/char/drm/drm_drv.c 2005-03-27 12:05:35 -08:00
@@ -15,10 +15,6 @@
* #define DRIVER_DESC "Matrox G200/G400"
* #define DRIVER_DATE "20001127"
*
- * #define DRIVER_MAJOR 2
- * #define DRIVER_MINOR 0
- * #define DRIVER_PATCHLEVEL 2
- *
* #define DRIVER_IOCTL_COUNT DRM_ARRAY_SIZE( mga_ioctls )
*
* #define drm_x mga_##x
@@ -412,12 +408,8 @@
}
DRM_INFO( "Initialized %s %d.%d.%d %s\n",
- DRIVER_NAME,
- DRIVER_MAJOR,
- DRIVER_MINOR,
- DRIVER_PATCHLEVEL,
- DRIVER_DATE
- );
+ CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL,
+ CORE_DATE);
return 0;
err_p3:
drm_sysfs_destroy(drm_class);
diff -Nru a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
--- a/drivers/char/drm/drm_stub.c 2005-03-27 12:05:35 -08:00
+++ b/drivers/char/drm/drm_stub.c 2005-03-27 12:05:35 -08:00
@@ -40,8 +40,8 @@
unsigned int drm_debug = 0; /* 1 to enable debug output */
EXPORT_SYMBOL(drm_debug);
-MODULE_AUTHOR( DRIVER_AUTHOR );
-MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_AUTHOR( CORE_AUTHOR );
+MODULE_DESCRIPTION( CORE_DESC );
MODULE_LICENSE("GPL and additional rights");
MODULE_PARM_DESC(cards_limit, "Maximum number of graphics cards");
MODULE_PARM_DESC(debug, "Enable debug output");
diff -Nru a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
--- a/drivers/char/drm/drm_sysfs.c 2005-03-27 12:05:35 -08:00
+++ b/drivers/char/drm/drm_sysfs.c 2005-03-27 12:05:35 -08:00
@@ -55,8 +55,8 @@
/* Display the version of drm_core. This doesn't work right in current design
*/
static ssize_t version_show(struct class *dev, char *buf)
{
- return sprintf(buf, "%s %d.%d.%d %s\n", DRIVER_NAME, DRIVER_MAJOR,
- DRIVER_MINOR, DRIVER_PATCHLEVEL, DRIVER_DATE);
+ return sprintf(buf, "%s %d.%d.%d %s\n", CORE_NAME, CORE_MAJOR,
+ CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
}
static CLASS_ATTR(version, S_IRUGO, version_show, NULL);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
