summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2009-05-18 12:51:16 -0700
committerAaron Plattner <aplattner@nvidia.com>2009-05-18 12:51:16 -0700
commit316d4faee5c93da941817f0c9cc567e718dbe1f7 (patch)
tree0feb08806279a5a94e1776a3cf8dec78b8a49393
parentdf49825431922705674b0f66c1f7ab6e0168dd7b (diff)
185.18.08185.18.08
-rw-r--r--nvidia-xconfig.h1
-rw-r--r--option_table.h6
-rw-r--r--options.c1
3 files changed, 0 insertions, 8 deletions
diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index bd94726..28e8a49 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -76,7 +76,6 @@ typedef struct {
#define MULTISAMPLE_COMPATIBILITY_BOOL_OPTION 22
#define XVMC_USES_TEXTURES_BOOL_OPTION 23
#define EXACT_MODE_TIMINGS_DVI_BOOL_OPTION 24
-#define LOAD_KERNEL_MODULE_BOOL_OPTION 26
#define ADD_ARGB_GLX_VISUALS_BOOL_OPTION 27
#define COMPOSITE_BOOL_OPTION 28
#define DISABLE_GLX_ROOT_CLIPPING_BOOL_OPTION 29
diff --git a/option_table.h b/option_table.h
index f6dc731..c56e20a 100644
--- a/option_table.h
+++ b/option_table.h
@@ -314,12 +314,6 @@ static const NVGetoptOption __options[] = {
"not specified, the first Server Layout in the X configuration "
"file is used." },
- { "load-kernel-module",
- XCONFIG_BOOL_VAL(LOAD_KERNEL_MODULE_BOOL_OPTION),
- NVGETOPT_IS_BOOLEAN, NULL,
- "Allow or disallow NVIDIA Linux X driver module to load the NVIDIA "
- "Linux kernel module automatically."},
-
{ "logo",
XCONFIG_BOOL_VAL(NOLOGO_BOOL_OPTION), NVGETOPT_IS_BOOLEAN, NULL,
"Disable or enable the \"NoLogo\" X configuration option." },
diff --git a/options.c b/options.c
index cd1f13e..918837e 100644
--- a/options.c
+++ b/options.c
@@ -64,7 +64,6 @@ static const NvidiaXConfigOption __options[] = {
{ MULTISAMPLE_COMPATIBILITY_BOOL_OPTION, FALSE, "MultisampleCompatibility" },
{ XVMC_USES_TEXTURES_BOOL_OPTION, FALSE, "XvmcUsesTextures" },
{ EXACT_MODE_TIMINGS_DVI_BOOL_OPTION, FALSE, "ExactModeTimingsDVI" },
- { LOAD_KERNEL_MODULE_BOOL_OPTION, FALSE, "LoadKernelModule" },
{ ADD_ARGB_GLX_VISUALS_BOOL_OPTION, FALSE, "AddARGBGLXVisuals" },
{ DISABLE_GLX_ROOT_CLIPPING_BOOL_OPTION, FALSE, "DisableGLXRootClipping" },
{ USE_EDID_DPI_BOOL_OPTION, FALSE, "UseEdidDpi" },