summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-08-29 03:38:49 +0200
committerDave Airlie <airlied@redhat.com>2012-09-07 05:24:34 +0200
commit5d2afab958f8cd203a8fe639082b5b5e74f748f9 (patch)
treebc769725be83b68f31720a67e329277c119a9088 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
parentdrm: use drm_compat_ioctl for 32-bit apps (diff)
downloadlinux-5d2afab958f8cd203a8fe639082b5b5e74f748f9.tar.xz
linux-5d2afab958f8cd203a8fe639082b5b5e74f748f9.zip
drm/vmwgfx: allow a kconfig option to choose if fbcon is enabled
This makes things easier for distros where we'd like to have fbcon enabled all the time. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 4d9edead01ac..7f4f4eecf45a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -183,7 +183,7 @@ static struct pci_device_id vmw_pci_id_list[] = {
{0, 0, 0}
};
-static int enable_fbdev;
+static int enable_fbdev = IS_ENABLED(CONFIG_DRM_VMWGFX_FBCON);
static int vmw_probe(struct pci_dev *, const struct pci_device_id *);
static void vmw_master_init(struct vmw_master *);