diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2006-06-26 00:26:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 09:58:30 -0700 |
commit | ba70710e59c701734aad524bc441b3400700e94b (patch) | |
tree | b48dc0a2295ac3a1c76d60418c1ca0ddb02d99cc /drivers/video/fbmon.c | |
parent | 026fbe16c29848648599df9967b98250a6b86916 (diff) | |
download | linux-3.10-ba70710e59c701734aad524bc441b3400700e94b.tar.gz linux-3.10-ba70710e59c701734aad524bc441b3400700e94b.tar.bz2 linux-3.10-ba70710e59c701734aad524bc441b3400700e94b.zip |
[PATCH] fbdev: Firmware EDID fixes
- make firmware edid independent from framebuffer (No need to choose
framebuffer just to disable this option
- enable this option in X86_64
- check if VBE/DDC function is implemented before calling actual function
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/fbmon.c')
-rw-r--r-- | drivers/video/fbmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index 87b0224d234..3ccfff715a5 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -1301,7 +1301,7 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info) -EINVAL : 0; } -#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__) +#if defined(CONFIG_FIRMWARE_EDID) && defined(CONFIG_X86) /* * We need to ensure that the EDID block is only returned for |