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
/
matrox
/
matroxfb_crtc2.c
diff --git
a/drivers/video/matrox/matroxfb_crtc2.c
b/drivers/video/matrox/matroxfb_crtc2.c
index
0d7e067
..
75d1969
100644
(file)
--- a/
drivers/video/matrox/matroxfb_crtc2.c
+++ b/
drivers/video/matrox/matroxfb_crtc2.c
@@
-721,6
+721,9
@@
static struct matroxfb_driver crtc2 = {
.remove = matroxfb_crtc2_remove };
static int matroxfb_crtc2_init(void) {
.remove = matroxfb_crtc2_remove };
static int matroxfb_crtc2_init(void) {
+ if (fb_get_options("matrox_crtc2fb", NULL))
+ return -ENODEV;
+
matroxfb_register_driver(&crtc2);
return 0;
}
matroxfb_register_driver(&crtc2);
return 0;
}