Commit ec84153d authored by Jim Hague's avatar Jim Hague Committed by Linus Torvalds

[PATCH] pm2fb: use modedb in modules

- modedb is now available in modules.
Signed-off-by: default avatarJim Hague <jim.hague@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2be1f273
...@@ -112,8 +112,7 @@ static struct fb_fix_screeninfo pm2fb_fix __initdata = { ...@@ -112,8 +112,7 @@ static struct fb_fix_screeninfo pm2fb_fix __initdata = {
}; };
/* /*
* Default video mode. In case the modedb doesn't work, or we're * Default video mode. In case the modedb doesn't work.
* a module (in which case modedb doesn't really work).
*/ */
static struct fb_var_screeninfo pm2fb_var __initdata = { static struct fb_var_screeninfo pm2fb_var __initdata = {
/* "640x480, 8 bpp @ 60 Hz */ /* "640x480, 8 bpp @ 60 Hz */
...@@ -1153,13 +1152,11 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, ...@@ -1153,13 +1152,11 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
info->flags = FBINFO_DEFAULT | info->flags = FBINFO_DEFAULT |
FBINFO_HWACCEL_YPAN; FBINFO_HWACCEL_YPAN;
#ifndef MODULE
if (!mode) if (!mode)
mode = "640x480@60"; mode = "640x480@60";
err = fb_find_mode(&info->var, info, mode, NULL, 0, NULL, 8); err = fb_find_mode(&info->var, info, mode, NULL, 0, NULL, 8);
if (!err || err == 4) if (!err || err == 4)
#endif
info->var = pm2fb_var; info->var = pm2fb_var;
if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment