projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'topic/drm-misc-2016-04-01' of git://anongit.freedesktop.org/drm-intel...
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_drm.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_drm.c
b/drivers/gpu/drm/nouveau/nouveau_drm.c
index d06877d9c1edd910c093ae53939d0269f2df2006..db5c7d0cc25ce4c4de6b7d8da8ae917e5fc68aa3 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_drm.c
@@
-1083,10
+1083,8
@@
nouveau_drm_init(void)
nouveau_display_options();
if (nouveau_modeset == -1) {
-#ifdef CONFIG_VGA_CONSOLE
if (vgacon_text_force())
nouveau_modeset = 0;
-#endif
}
if (!nouveau_modeset)