summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/tridentfb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/fbdev/tridentfb.c')
-rw-r--r--drivers/video/fbdev/tridentfb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/fbdev/tridentfb.c b/drivers/video/fbdev/tridentfb.c
index 219ce7292337..6099b9768ba1 100644
--- a/drivers/video/fbdev/tridentfb.c
+++ b/drivers/video/fbdev/tridentfb.c
@@ -1811,7 +1811,12 @@ static int __init tridentfb_init(void)
{
#ifndef MODULE
char *option = NULL;
+#endif
+
+ if (fb_modesetting_disabled("tridentfb"))
+ return -ENODEV;
+#ifndef MODULE
if (fb_get_options("tridentfb", &option))
return -ENODEV;
tridentfb_setup(option);