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 2.0 rc7
[linux-2.6.git]
/
drivers
/
video
/
chipsfb.c
diff --git
a/drivers/video/chipsfb.c
b/drivers/video/chipsfb.c
index
c804352
..
ab98f22
100644
(file)
--- a/
drivers/video/chipsfb.c
+++ b/
drivers/video/chipsfb.c
@@
-362,7
+362,7
@@
static void __init init_chips(struct fb_info *p, unsigned long addr)
p->var = chipsfb_var;
p->fbops = &chipsfb_ops;
p->var = chipsfb_var;
p->fbops = &chipsfb_ops;
- p->flags = FBINFO_
FLAG_
DEFAULT;
+ p->flags = FBINFO_DEFAULT;
fb_alloc_cmap(&p->cmap, 256, 0);
fb_alloc_cmap(&p->cmap, 256, 0);
@@
-416,7
+416,7
@@
chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
release_mem_region(addr, size);
return -ENOMEM;
}
release_mem_region(addr, size);
return -ENOMEM;
}
-
+ p->device = &dp->dev;
init_chips(p, addr);
#ifdef CONFIG_PMAC_PBOOK
init_chips(p, addr);
#ifdef CONFIG_PMAC_PBOOK
@@
-462,9
+462,14
@@
static struct pci_driver chipsfb_driver = {
int __init chips_init(void)
{
int __init chips_init(void)
{
- return pci_module_init(&chipsfb_driver);
+ if (fb_get_options("chipsfb", NULL))
+ return -ENODEV;
+
+ return pci_register_driver(&chipsfb_driver);
}
}
+module_init(chips_init);
+
static void __exit chipsfb_exit(void)
{
pci_unregister_driver(&chipsfb_driver);
static void __exit chipsfb_exit(void)
{
pci_unregister_driver(&chipsfb_driver);