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
/
clps711xfb.c
diff --git
a/drivers/video/clps711xfb.c
b/drivers/video/clps711xfb.c
index
a982e75
..
8692e00
100644
(file)
--- a/
drivers/video/clps711xfb.c
+++ b/
drivers/video/clps711xfb.c
@@
-364,6
+364,9
@@
int __init clps711xfb_init(void)
{
int err = -ENOMEM;
{
int err = -ENOMEM;
+ if (fb_get_options("clps711xfb", NULL))
+ return -ENODEV;
+
cfb = kmalloc(sizeof(*cfb), GFP_KERNEL);
if (!cfb)
goto out;
cfb = kmalloc(sizeof(*cfb), GFP_KERNEL);
if (!cfb)
goto out;
@@
-372,7
+375,7
@@
int __init clps711xfb_init(void)
strcpy(cfb->fix.id, "clps711x");
cfb->fbops = &clps7111fb_ops;
strcpy(cfb->fix.id, "clps711x");
cfb->fbops = &clps7111fb_ops;
- cfb->flags = FBINFO_
FLAG_
DEFAULT;
+ cfb->flags = FBINFO_DEFAULT;
clps711x_guess_lcd_params(cfb);
clps711x_guess_lcd_params(cfb);
@@
-432,9
+435,7
@@
static void __exit clps711xfb_exit(void)
}
}
}
}
-#ifdef MODULE
module_init(clps711xfb_init);
module_init(clps711xfb_init);
-#endif
module_exit(clps711xfb_exit);
MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
module_exit(clps711xfb_exit);
MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");