summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/cirrus
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-05-19 17:33:21 +0200
committerDave Airlie <airlied@redhat.com>2012-05-19 17:34:16 +0200
commit4688a69dd197fd225cca669c40d67b79f669a5a6 (patch)
treebcafdae9be71dba9659fb5fb4a180687f9942d15 /drivers/gpu/drm/cirrus
parentdrm/prime: expose capability flags for userspace. (diff)
downloadlinux-4688a69dd197fd225cca669c40d67b79f669a5a6.tar.xz
linux-4688a69dd197fd225cca669c40d67b79f669a5a6.zip
drm/cirrus/ast/mgag200: fix build without CONFIG_VGA_CONSOLE
Reported-by: Randy Dunlap Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/cirrus')
-rw-r--r--drivers/gpu/drm/cirrus/cirrus_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index 2e1f925b5caf..d7038230b71e 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -84,8 +84,10 @@ static struct pci_driver cirrus_pci_driver = {
static int __init cirrus_init(void)
{
+#ifdef CONFIG_VGA_CONSOLE
if (vgacon_text_force() && cirrus_modeset == -1)
return -EINVAL;
+#endif
if (cirrus_modeset == 0)
return -EINVAL;