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>

diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e302d2b742ab0164a10dc0eac6fa24f808015e14..65059ba32044dac9372038c0bca8e791ecabdff0 100644 (file)
--- 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);
                }
        }