diff options
| author | Jordan Crouse <jordan.crouse@amd.com> | 2006-12-08 02:40:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:29:05 -0800 |
| commit | c25623f5540694ba70af272170d67f1411be97b1 (patch) | |
| tree | f8c9e252093b860b198603d7737df4c698d25b24 /drivers | |
| parent | 572c04b24bd7b7e4b6a684416325cc3751fa8f45 (diff) | |
| download | linux-c25623f5540694ba70af272170d67f1411be97b1.tar.bz2 | |
[PATCH] video: Get the default mode from the right database
If no default mode is specified, it should be grabbed from the supplied
database, not the default one.
[teanropo@jyu.fi: fix it]
[akpm@osdl.org: simplify it]
[akpm@osdl.org: remove pointless DEFAULT_MODEDB_INDEX]
Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Tero Roponen <teanropo@jyu.fi>
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/modedb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c index d1267904c280..5df41f6f2b86 100644 --- a/drivers/video/modedb.c +++ b/drivers/video/modedb.c @@ -34,8 +34,6 @@ const char *global_mode_option; * Standard video mode definitions (taken from XFree86) */ -#define DEFAULT_MODEDB_INDEX 0 - static const struct fb_videomode modedb[] = { { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -505,8 +503,10 @@ int fb_find_mode(struct fb_var_screeninfo *var, db = modedb; dbsize = ARRAY_SIZE(modedb); } + if (!default_mode) - default_mode = &modedb[DEFAULT_MODEDB_INDEX]; + default_mode = &db[0]; + if (!default_bpp) default_bpp = 8; |