358.09358.09

4 files changed, 3 insertions, 10 deletions

diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index 4c27f39..e0b6d9f 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -65,9 +65,8 @@
 #define PRESERVE_BUSID_BOOL_OPTION              39
 #define BASE_MOSAIC_BOOL_OPTION                 40
 #define ALLOW_EMPTY_INITIAL_CONFIGURATION       41
-#define DELETE_UNUSED_DP12_DPYS                 42
-#define INBAND_STEREO_SIGNALING                 43
-#define FORCE_YUV_420                           44
+#define INBAND_STEREO_SIGNALING                 42
+#define FORCE_YUV_420                           43
 
 #define XCONFIG_BOOL_OPTION_COUNT (FORCE_YUV_420 + 1)
 
diff --git a/option_table.h b/option_table.h
index 3c9231c..624e9e5 100644
--- a/option_table.h
+++ b/option_table.h
@@ -645,11 +645,6 @@ static const NVGetoptOption __options[] = {
       NVGETOPT_IS_BOOLEAN, NULL, "Allow the X server to start even if no "
       "connected display devices could be detected." },
 
-    { "delete-unused-dp12-displays", XCONFIG_BOOL_VAL(DELETE_UNUSED_DP12_DPYS),
-      NVGETOPT_IS_BOOLEAN, NULL, "Delete DisplayPort 1.2 RandR outputs that "
-      "are disconnected and not named in any MetaModes.  This option is "
-      "deprecated." },
-
     { "inband-stereo-signaling", XCONFIG_BOOL_VAL(INBAND_STEREO_SIGNALING),
       NVGETOPT_IS_BOOLEAN, NULL, "Enable or disable the "
       "\"InbandStereoSignaling\" X configuration option." },
diff --git a/options.c b/options.c
index bad37d4..6ca2aa4 100644
--- a/options.c
+++ b/options.c
@@ -68,7 +68,6 @@ static const NvidiaXConfigOption __options[] = {
     { MODE_DEBUG_BOOL_OPTION,                FALSE, "ModeDebug" },
     { BASE_MOSAIC_BOOL_OPTION,               FALSE, "BaseMosaic" },
     { ALLOW_EMPTY_INITIAL_CONFIGURATION,     FALSE, "AllowEmptyInitialConfiguration" },
-    { DELETE_UNUSED_DP12_DPYS,               FALSE, "DeleteUnusedDP12Displays" },
     { INBAND_STEREO_SIGNALING,               FALSE, "InbandStereoSignaling" },
     { FORCE_YUV_420,                         FALSE, "ForceYUV420" },
     { 0,                                     FALSE, NULL },
diff --git a/version.mk b/version.mk
index 82dd488..268c9a1 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 355.11
+NVIDIA_VERSION = 358.09