summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/cyber2000fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/fbdev/cyber2000fb.c')
-rw-r--r--drivers/video/fbdev/cyber2000fb.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c
index 585af90a68a5..f005db54371f 100644
--- a/drivers/video/fbdev/cyber2000fb.c
+++ b/drivers/video/fbdev/cyber2000fb.c
@@ -48,7 +48,6 @@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-
#ifdef __arm__
#include <asm/mach-types.h>
#endif
@@ -1876,7 +1875,12 @@ static int __init cyber2000fb_init(void)
#ifndef MODULE
char *option = NULL;
+#endif
+ if (fb_modesetting_disabled("CyberPro"))
+ return -ENODEV;
+
+#ifndef MODULE
if (fb_get_options("cyber2000fb", &option))
return -ENODEV;
cyber2000fb_setup(option);