X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fasiliantfb.c;h=15e09259057a0a688fca793183593e6addf38322;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=034ec299613d4525bea505af47c6f00e30fb76fa;hpb=e812ccbe0c915857ebea6a632bfadc631f7504a9;p=linux-2.6.git

diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 034ec2996..15e092590 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -524,7 +524,7 @@ static void __init init_asiliant(struct fb_info *p, unsigned long addr)
 	p->fix.smem_start	= addr;
 	p->var			= asiliantfb_var;
 	p->fbops		= &asiliantfb_ops;
-	p->flags		= FBINFO_FLAG_DEFAULT;
+	p->flags		= FBINFO_DEFAULT;
 
 	fb_alloc_cmap(&p->cmap, 256, 0);
 
@@ -571,13 +571,10 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
 	}
 
 	pci_write_config_dword(dp, 4, 0x02800083);
-	writeb(3, addr + 0x400784);
+	writeb(3, p->screen_base + 0x400784);
 
 	init_asiliant(p, addr);
 
-	/* Clear the entire framebuffer */
-	memset(p->screen_base, 0, 0x200000);
-
 	pci_set_drvdata(dp, p);
 	return 0;
 }
@@ -609,9 +606,14 @@ static struct pci_driver asiliantfb_driver = {
 
 int __init asiliantfb_init(void)
 {
+	if (fb_get_options("asiliantfb", NULL))
+		return -ENODEV;
+
 	return pci_module_init(&asiliantfb_driver);
 }
 
+module_init(asiliantfb_init);
+
 static void __exit asiliantfb_exit(void)
 {
 	pci_unregister_driver(&asiliantfb_driver);