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
/
p9100.c
diff --git
a/drivers/video/p9100.c
b/drivers/video/p9100.c
index
67b71d5
..
7fbbef4
100644
(file)
--- a/
drivers/video/p9100.c
+++ b/
drivers/video/p9100.c
@@
-297,7
+297,7
@@
static void p9100_init_one(struct sbus_dev *sdev)
sbus_ioremap(&sdev->resource[0], 0,
sizeof(struct p9100_regs), "p9100 regs");
sbus_ioremap(&sdev->resource[0], 0,
sizeof(struct p9100_regs), "p9100 regs");
- all->info.flags = FBINFO_
FLAG_
DEFAULT;
+ all->info.flags = FBINFO_DEFAULT;
all->info.fbops = &p9100_ops;
#ifdef CONFIG_SPARC32
all->info.screen_base = (char *)
all->info.fbops = &p9100_ops;
#ifdef CONFIG_SPARC32
all->info.screen_base = (char *)
@@
-340,6
+340,9
@@
int __init p9100_init(void)
struct sbus_bus *sbus;
struct sbus_dev *sdev;
struct sbus_bus *sbus;
struct sbus_dev *sdev;
+ if (fb_get_options("p9100fb", NULL))
+ return -ENODEV;
+
for_all_sbusdev(sdev, sbus) {
if (!strcmp(sdev->prom_name, "p9100"))
p9100_init_one(sdev);
for_all_sbusdev(sdev, sbus) {
if (!strcmp(sdev->prom_name, "p9100"))
p9100_init_one(sdev);
@@
-368,8
+371,9
@@
p9100_setup(char *arg)
return 0;
}
return 0;
}
-#ifdef MODULE
module_init(p9100_init);
module_init(p9100_init);
+
+#ifdef MODULE
module_exit(p9100_exit);
#endif
module_exit(p9100_exit);
#endif