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
/
stifb.c
diff --git
a/drivers/video/stifb.c
b/drivers/video/stifb.c
index
9a15615
..
4b7e498
100644
(file)
--- a/
drivers/video/stifb.c
+++ b/
drivers/video/stifb.c
@@
-1298,6
+1298,7
@@
stifb_init_fb(struct sti_struct *sti, int force_bpp)
case 1:
fix->type = FB_TYPE_PLANES; /* well, sort of */
fix->visual = FB_VISUAL_MONO10;
case 1:
fix->type = FB_TYPE_PLANES; /* well, sort of */
fix->visual = FB_VISUAL_MONO10;
+ var->red.length = var->green.length = var->blue.length = 1;
break;
case 8:
fix->type = FB_TYPE_PACKED_PIXELS;
break;
case 8:
fix->type = FB_TYPE_PACKED_PIXELS;
@@
-1324,7
+1325,7
@@
stifb_init_fb(struct sti_struct *sti, int force_bpp)
strcpy(fix->id, "stifb");
info->fbops = &stifb_ops;
info->screen_base = (void*) REGION_BASE(fb,1);
strcpy(fix->id, "stifb");
info->fbops = &stifb_ops;
info->screen_base = (void*) REGION_BASE(fb,1);
- info->flags = FBINFO_
FLAG_
DEFAULT;
+ info->flags = FBINFO_DEFAULT;
info->currcon = -1;
/* This has to been done !!! */
info->currcon = -1;
/* This has to been done !!! */
@@
-1375,12
+1376,22
@@
out_err0:
static int stifb_disabled __initdata;
static int stifb_disabled __initdata;
+int __init
+stifb_setup(char *options);
+
int __init
stifb_init(void)
{
struct sti_struct *sti;
int i;
int __init
stifb_init(void)
{
struct sti_struct *sti;
int i;
+#ifndef MODULE
+ char *option = NULL;
+
+ if (fb_get_options("stifb", &option))
+ return -ENODEV;
+ stifb_setup(option);
+#endif
if (stifb_disabled) {
printk(KERN_INFO "stifb: disabled by \"stifb=off\" kernel parameter\n");
return -ENXIO;
if (stifb_disabled) {
printk(KERN_INFO "stifb: disabled by \"stifb=off\" kernel parameter\n");
return -ENXIO;
@@
-1451,9
+1462,7
@@
stifb_setup(char *options)
__setup("stifb=", stifb_setup);
__setup("stifb=", stifb_setup);
-#ifdef MODULE
module_init(stifb_init);
module_init(stifb_init);
-#endif
module_exit(stifb_cleanup);
MODULE_AUTHOR("Helge Deller <deller@gmx.de>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
module_exit(stifb_cleanup);
MODULE_AUTHOR("Helge Deller <deller@gmx.de>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>");