drm/cirrus/ast/mgag200: fix build without CONFIG_VGA_CONSOLE
authorDave Airlie <airlied@redhat.com>
Sat, 19 May 2012 15:33:21 +0000 (16:33 +0100)
committerDave Airlie <airlied@redhat.com>
Sat, 19 May 2012 15:34:16 +0000 (16:34 +0100)
Reported-by: Randy Dunlap
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/ast/ast_drv.c
drivers/gpu/drm/cirrus/cirrus_drv.c
drivers/gpu/drm/mgag200/mgag200_drv.c

index b56eac6..d0c4574 100644 (file)
@@ -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;
index 2e1f925..d703823 100644 (file)
@@ -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;
index f03a636..3c8e04f 100644 (file)
@@ -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;