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
/
aty
/
aty128fb.c
diff --git
a/drivers/video/aty/aty128fb.c
b/drivers/video/aty/aty128fb.c
index
1c7bcd8
..
f2d82d0
100644
(file)
--- a/
drivers/video/aty/aty128fb.c
+++ b/
drivers/video/aty/aty128fb.c
@@
-2439,6
+2439,14
@@
static int aty128_pci_resume(struct pci_dev *pdev)
int __init aty128fb_init(void)
{
int __init aty128fb_init(void)
{
+#ifndef MODULE
+ char *option = NULL;
+
+ if (fb_get_options("aty128fb", &option))
+ return -ENODEV;
+ aty128fb_setup(option);
+#endif
+
return pci_module_init(&aty128fb_driver);
}
return pci_module_init(&aty128fb_driver);
}
@@
-2447,8
+2455,9
@@
static void __exit aty128fb_exit(void)
pci_unregister_driver(&aty128fb_driver);
}
pci_unregister_driver(&aty128fb_driver);
}
-#ifdef MODULE
module_init(aty128fb_init);
module_init(aty128fb_init);
+
+#ifdef MODULE
module_exit(aty128fb_exit);
MODULE_AUTHOR("(c)1999-2003 Brad Douglas <brad@neruo.com>");
module_exit(aty128fb_exit);
MODULE_AUTHOR("(c)1999-2003 Brad Douglas <brad@neruo.com>");