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
/
cg3.c
diff --git
a/drivers/video/cg3.c
b/drivers/video/cg3.c
index
dd0163c
..
0783941
100644
(file)
--- a/
drivers/video/cg3.c
+++ b/
drivers/video/cg3.c
@@
-398,7
+398,7
@@
static void cg3_init_one(struct sbus_dev *sdev)
sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET,
sizeof(struct cg3_regs), "cg3 regs");
sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET,
sizeof(struct cg3_regs), "cg3 regs");
- all->info.flags = FBINFO_
FLAG_
DEFAULT;
+ all->info.flags = FBINFO_DEFAULT;
all->info.fbops = &cg3_ops;
#ifdef CONFIG_SPARC32
all->info.screen_base = (char *)
all->info.fbops = &cg3_ops;
#ifdef CONFIG_SPARC32
all->info.screen_base = (char *)
@@
-444,6
+444,9
@@
int __init cg3_init(void)
struct sbus_bus *sbus;
struct sbus_dev *sdev;
struct sbus_bus *sbus;
struct sbus_dev *sdev;
+ if (fb_get_options("cg3fb", NULL))
+ return -ENODEV;
+
for_all_sbusdev(sdev, sbus) {
if (!strcmp(sdev->prom_name, "cgthree") ||
!strcmp(sdev->prom_name, "cgRDI"))
for_all_sbusdev(sdev, sbus) {
if (!strcmp(sdev->prom_name, "cgthree") ||
!strcmp(sdev->prom_name, "cgRDI"))
@@
-473,8
+476,9
@@
cg3_setup(char *arg)
return 0;
}
return 0;
}
-#ifdef MODULE
module_init(cg3_init);
module_init(cg3_init);
+
+#ifdef MODULE
module_exit(cg3_exit);
#endif
module_exit(cg3_exit);
#endif