svn merge ^/branches/released .

2 files changed, 3 insertions, 4 deletions

diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c
index a36f65da4..2df2386ff 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.c
+++ b/mesalib/src/mesa/drivers/dri/common/utils.c
@@ -96,7 +96,6 @@ driParseDebugString( const char * debug,
  * 

  * \param buffer         Buffer to hold the \c GL_RENDERER string.

  * \param hardware_name  Name of the hardware.

- * \param driver_date    Driver date.

  * \param agp_mode       AGP mode (speed).

  * 

  * \returns

@@ -105,12 +104,12 @@ driParseDebugString( const char * debug,
  */

 unsigned

 driGetRendererString( char * buffer, const char * hardware_name,

-		      const char * driver_date, GLuint agp_mode )

+		      GLuint agp_mode )

 {

    unsigned offset;

    char *cpu;

 

-   offset = sprintf( buffer, "Mesa DRI %s %s", hardware_name, driver_date );

+   offset = sprintf( buffer, "Mesa DRI %s", hardware_name );

 

    /* Append any AGP-specific information.

     */

diff --git a/mesalib/src/mesa/drivers/dri/common/utils.h b/mesalib/src/mesa/drivers/dri/common/utils.h
index 2c952dc19..10fb23de9 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.h
+++ b/mesalib/src/mesa/drivers/dri/common/utils.h
@@ -76,7 +76,7 @@ extern unsigned driParseDebugString( const char * debug,
     const struct dri_debug_control * control );

 

 extern unsigned driGetRendererString( char * buffer,

-    const char * hardware_name, const char * driver_date, GLuint agp_mode );

+    const char * hardware_name, GLuint agp_mode );

 

 extern void driInitExtensions( struct gl_context * ctx, 

     const struct dri_extension * card_extensions, GLboolean enable_imaging );