From 240ef2b696bcb4d89b330a9aa42f195788b37a09 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Thu, 4 Dec 2014 14:39:36 -0800
Subject: 304.125

---
 XF86Config-parser/Generate.c | 18 +-----------------
 version.mk                   |  2 +-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/XF86Config-parser/Generate.c b/XF86Config-parser/Generate.c
index 0705b39..31d709c 100644
--- a/XF86Config-parser/Generate.c
+++ b/XF86Config-parser/Generate.c
@@ -1313,13 +1313,10 @@ static char *xconfigGetDefaultProjectRoot(void)
  * get_xserver_information() - parse the versionString (from `X
  * -version`) and assign relevant information that we infer from the X
  * server version.
- *
- * Note: this implementation should be shared with nvidia-installer
  */
 
 static int get_xserver_information(const char *versionString,
                                    int *isXorg,
-                                   int *isModular,
                                    int *autoloadsGLX,
                                    int *supportsExtensionSection)
 {
@@ -1333,7 +1330,6 @@ static int get_xserver_information(const char *versionString,
 
     if (strstr(versionString, "XFree86 Version")) {
         *isXorg = FALSE;
-        *isModular = FALSE;
         *autoloadsGLX = FALSE;
         *supportsExtensionSection = FALSE;
         return TRUE;
@@ -1362,17 +1358,6 @@ static int get_xserver_information(const char *versionString,
 
     if (!found) return FALSE;
 
-    /*
-     * isModular: X.Org X11R6.x X servers are monolithic, all others
-     * are modular
-     */
-
-    if (major == 6) {
-        *isModular = FALSE;
-    } else {
-        *isModular = TRUE;
-    }
-
     /*
      * supportsExtensionSection: support for the "Extension" xorg.conf
      * section was added between X.Org 6.7 and 6.8.  To account for
@@ -1430,7 +1415,7 @@ void xconfigGetXServerInUse(GenerateOptions *gop)
     FILE *stream = NULL;
     int xserver = -1;
     int isXorg;
-    int dummy, len, found;
+    int len, found;
     char *cmd, *ptr, *ret;
 
     gop->supports_extension_section = FALSE;
@@ -1462,7 +1447,6 @@ void xconfigGetXServerInUse(GenerateOptions *gop)
 
         found = get_xserver_information(buf,
                                         &isXorg,
-                                        &dummy, /* isModular */
                                         &gop->autoloads_glx,
                                         &gop->supports_extension_section);
 
diff --git a/version.mk b/version.mk
index 17a52e5..9eef500 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.123
+NVIDIA_VERSION = 304.125
-- 
cgit v1.2.3