aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-05-29 18:45:19 +1000
committerDave Airlie <airlied@linux.ie>2006-05-29 18:45:19 +1000
commit080a416802153dbbb20ab4f4fa1225867096d071 (patch)
tree519f0ae3e845403b237c4a16ed8e3eaa5e3a165a
parent65eb2f97db17f6f6a92cad3aad93b531f991ebf1 (diff)
Revert "intelfb driver -- use the regular modedb table instead of the VESA"
This reverts 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 commit. This conflicts with a patch in -mm from Antonino reapply later. Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r--drivers/video/intelfb/intelfbdrv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e302d2b742a..65059ba3204 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1033,13 +1033,15 @@ intelfb_init_var(struct intelfb_info *dinfo)
} else {
if (mode) {
msrc = fb_find_mode(var, dinfo->info, mode,
- NULL, 0, NULL, 0);
+ vesa_modes, VESA_MODEDB_SIZE,
+ NULL, 0);
if (msrc)
msrc |= 8;
}
if (!msrc) {
msrc = fb_find_mode(var, dinfo->info, PREFERRED_MODE,
- NULL, 0, NULL, 0);
+ vesa_modes, VESA_MODEDB_SIZE,
+ NULL, 0);
}
}