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
/
tcx.c
diff --git
a/drivers/video/tcx.c
b/drivers/video/tcx.c
index
543711c
..
e3e43ca
100644
(file)
--- 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->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 *)
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;
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);
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;
}
return 0;
}
-#ifdef MODULE
module_init(tcx_init);
module_init(tcx_init);
+
+#ifdef MODULE
module_exit(tcx_exit);
#endif
module_exit(tcx_exit);
#endif