diff options
| -rw-r--r-- | drivers/gpu/drm/nouveau/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 4ae78bfd5722..d823e6319516 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -13,17 +13,6 @@ config DRM_NOUVEAU help Choose this option for open-source nVidia support. -config DRM_NOUVEAU_KMS - bool "Enable modesetting on nouveau by default" - depends on DRM_NOUVEAU - help - Choose this option if you want kernel modesetting enabled by default, - and you have a new enough userspace to support this. Running old - userspaces with this enabled will cause pain. - - NOTICE: if you plan on using the text based console outside of X, enable - FRAMEBUFFER_CONSOLE or else the console will be unusable. - config DRM_NOUVEAU_BACKLIGHT bool "Support for backlight control" depends on DRM_NOUVEAU diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 5db20bc5467f..35249c35118f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -383,11 +383,7 @@ static int __init nouveau_init(void) nouveau_modeset = 0; else #endif -#if defined(CONFIG_DRM_NOUVEAU_KMS) nouveau_modeset = 1; -#else - nouveau_modeset = 0; -#endif } if (nouveau_modeset == 1) |