X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fvideo%2Ftcx.c;h=e3e43ca2f6fe66d8654b463e4ffc99ea1a9e6892;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=543711c99ded5afa37b23da7d40e94d3633ecd4e;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 543711c99..e3e43ca2f 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -412,7 +412,7 @@ static void tcx_init_one(struct sbus_dev *sdev)
 		all->par.mmap_map[i].poff = sdev->reg_addrs[j].phys_addr;
 	}
 
-	all->info.flags = FBINFO_FLAG_DEFAULT;
+	all->info.flags = FBINFO_DEFAULT;
 	all->info.fbops = &tcx_ops;
 #ifdef CONFIG_SPARC32
 	all->info.screen_base = (char *)
@@ -468,6 +468,9 @@ int __init tcx_init(void)
 	struct sbus_bus *sbus;
 	struct sbus_dev *sdev;
 
+	if (fb_get_options("tcxfb", NULL))
+		return -ENODEV;
+
 	for_all_sbusdev(sdev, sbus) {
 		if (!strcmp(sdev->prom_name, "tcx"))
 			tcx_init_one(sdev);
@@ -496,8 +499,9 @@ tcx_setup(char *arg)
 	return 0;
 }
 
-#ifdef MODULE
 module_init(tcx_init);
+
+#ifdef MODULE
 module_exit(tcx_exit);
 #endif