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
/
valkyriefb.c
diff --git
a/drivers/video/valkyriefb.c
b/drivers/video/valkyriefb.c
index
fd8eb47
..
cdb1b14
100644
(file)
--- a/
drivers/video/valkyriefb.c
+++ b/
drivers/video/valkyriefb.c
@@
-322,6
+322,11
@@
int __init valkyriefb_init(void)
struct fb_info_valkyrie *p;
unsigned long frame_buffer_phys, cmap_regs_phys, flags;
int err;
struct fb_info_valkyrie *p;
unsigned long frame_buffer_phys, cmap_regs_phys, flags;
int err;
+ char *option = NULL;
+
+ if (fb_get_options("valkyriefb", &option))
+ return -ENODEV;
+ valkyriefb_setup(option);
#ifdef CONFIG_MAC
if (!MACH_IS_MAC)
#ifdef CONFIG_MAC
if (!MACH_IS_MAC)
@@
-540,7
+545,7
@@
static void __init valkyrie_init_info(struct fb_info *info, struct fb_info_valky
{
info->fbops = &valkyriefb_ops;
info->screen_base = (char *) p->frame_buffer + 0x1000;
{
info->fbops = &valkyriefb_ops;
info->screen_base = (char *) p->frame_buffer + 0x1000;
- info->flags = FBINFO_
FLAG_
DEFAULT;
+ info->flags = FBINFO_DEFAULT;
info->pseudo_palette = p->pseudo_palette;
fb_alloc_cmap(&info->cmap, 256, 0);
info->par = &p->par;
info->pseudo_palette = p->pseudo_palette;
fb_alloc_cmap(&info->cmap, 256, 0);
info->par = &p->par;
@@
-579,4
+584,5
@@
int __init valkyriefb_setup(char *options)
return 0;
}
return 0;
}
+module_init(valkyriefb_init);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");