Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Vandrovec <vandrove@vc.cvut.cz>2002-03-07 01:00:08 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-07 01:00:08 -0800
commit8f706ce4d83d0cf3a39b00eafe31a4b824c990ab (patch)
tree70ab5db3d360a987b60bf09d4855c690f3b4bf00
parent6cfda12a768e95117898e731014c7d412c08840f (diff)
[PATCH] matroxfb compile fix
* Make matroxfb compilable with Mystique, but without G450 support. Petr Vandrovec
-rw-r--r--drivers/video/matrox/matroxfb_DAC1064.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index ad5dfb1a1074..51aad5adb819 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -473,9 +473,12 @@ static void DAC1064_restore_2(WPMINFO struct display* p) {
static int m1064_compute(void* outdev, struct my_timming* m) {
#define minfo ((struct matrox_fb_info*)outdev)
+#ifdef CONFIG_FB_MATROX_G450
if (ACCESS_FBINFO(devflags.g450dac)) {
matroxfb_g450_setclk(PMINFO m->pixclock, M_PIXEL_PLL_C);
- } else {
+ } else
+#endif
+ {
int i;
int tmout;
CRITFLAGS