From: Dave Airlie Date: Sat, 19 May 2012 15:33:21 +0000 (+0100) Subject: drm/cirrus/ast/mgag200: fix build without CONFIG_VGA_CONSOLE X-Git-Tag: accepted/tizen/common/20141203.182822~4541^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4688a69dd197fd225cca669c40d67b79f669a5a6;p=platform%2Fkernel%2Flinux-arm64.git drm/cirrus/ast/mgag200: fix build without CONFIG_VGA_CONSOLE Reported-by: Randy Dunlap Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index b56eac6..d0c4574 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -221,8 +221,10 @@ static struct drm_driver driver = { static int __init ast_init(void) { +#ifdef CONFIG_VGA_CONSOLE if (vgacon_text_force() && ast_modeset == -1) return -EINVAL; +#endif if (ast_modeset == 0) return -EINVAL; diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c index 2e1f925..d703823 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; diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index f03a636..3c8e04f 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -93,8 +93,10 @@ static struct pci_driver mgag200_pci_driver = { static int __init mgag200_init(void) { +#ifdef CONFIG_VGA_CONSOLE if (vgacon_text_force() && mgag200_modeset == -1) return -EINVAL; +#endif if (mgag200_modeset == 0) return -EINVAL;