diff options
author | Dave Airlie <airlied@linux.ie> | 2006-05-29 04:45:19 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-05-29 04:45:19 -0400 |
commit | 080a416802153dbbb20ab4f4fa1225867096d071 (patch) | |
tree | 519f0ae3e845403b237c4a16ed8e3eaa5e3a165a /drivers/video/intelfb/intelfbdrv.c | |
parent | 65eb2f97db17f6f6a92cad3aad93b531f991ebf1 (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>
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index e302d2b742ab..65059ba32044 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -1033,13 +1033,15 @@ intelfb_init_var(struct intelfb_info *dinfo) | |||
1033 | } else { | 1033 | } else { |
1034 | if (mode) { | 1034 | if (mode) { |
1035 | msrc = fb_find_mode(var, dinfo->info, mode, | 1035 | msrc = fb_find_mode(var, dinfo->info, mode, |
1036 | NULL, 0, NULL, 0); | 1036 | vesa_modes, VESA_MODEDB_SIZE, |
1037 | NULL, 0); | ||
1037 | if (msrc) | 1038 | if (msrc) |
1038 | msrc |= 8; | 1039 | msrc |= 8; |
1039 | } | 1040 | } |
1040 | if (!msrc) { | 1041 | if (!msrc) { |
1041 | msrc = fb_find_mode(var, dinfo->info, PREFERRED_MODE, | 1042 | msrc = fb_find_mode(var, dinfo->info, PREFERRED_MODE, |
1042 | NULL, 0, NULL, 0); | 1043 | vesa_modes, VESA_MODEDB_SIZE, |
1044 | NULL, 0); | ||
1043 | } | 1045 | } |
1044 | } | 1046 | } |
1045 | 1047 | ||