git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
video
/
q40fb.c
diff --git
a/drivers/video/q40fb.c
b/drivers/video/q40fb.c
index
0c7b267
..
71b69da
100644
(file)
--- a/
drivers/video/q40fb.c
+++ b/
drivers/video/q40fb.c
@@
-105,7
+105,7
@@
static int __init q40fb_probe(struct device *device)
info->var = q40fb_var;
info->fix = q40fb_fix;
info->fbops = &q40fb_ops;
info->var = q40fb_var;
info->fix = q40fb_fix;
info->fbops = &q40fb_ops;
- info->flags = FBINFO_
FLAG_
DEFAULT; /* not as module for now */
+ info->flags = FBINFO_DEFAULT; /* not as module for now */
info->pseudo_palette = info->par;
info->par = NULL;
info->screen_base = (char *) q40fb_fix.smem_start;
info->pseudo_palette = info->par;
info->par = NULL;
info->screen_base = (char *) q40fb_fix.smem_start;
@@
-143,6
+143,9
@@
int __init q40fb_init(void)
{
int ret = 0;
{
int ret = 0;
+ if (fb_get_options("q40fb", NULL))
+ return -ENODEV;
+
ret = driver_register(&q40fb_driver);
if (!ret) {
ret = driver_register(&q40fb_driver);
if (!ret) {
@@
-153,4
+156,5
@@
int __init q40fb_init(void)
return ret;
}
return ret;
}
+module_init(q40fb_init);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");