diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2005-09-09 16:04:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:59 -0400 |
commit | 094bb659f53b6d90aab6067268d6d14f1f352d30 (patch) | |
tree | 37f2e11d4c0345bb7b84ec99f50ff77bd2f395a3 /drivers/video/nvidia/nv_proto.h | |
parent | 13776711ce4b234b5ad153e55e8b5d6703c6b1ef (diff) |
[PATCH] nvidiafb: Fallback to firmware EDID
If nvidiafb fails to probe the EDID block, get the EDID from the BIOS.
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/nvidia/nv_proto.h')
-rw-r--r-- | drivers/video/nvidia/nv_proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h index 42847ce1b8dd..cac44fc7f587 100644 --- a/drivers/video/nvidia/nv_proto.h +++ b/drivers/video/nvidia/nv_proto.h | |||
@@ -34,7 +34,7 @@ void NVLockUnlock(struct nvidia_par *par, int); | |||
34 | #if defined(CONFIG_FB_NVIDIA_I2C) || defined (CONFIG_PPC_OF) | 34 | #if defined(CONFIG_FB_NVIDIA_I2C) || defined (CONFIG_PPC_OF) |
35 | void nvidia_create_i2c_busses(struct nvidia_par *par); | 35 | void nvidia_create_i2c_busses(struct nvidia_par *par); |
36 | void nvidia_delete_i2c_busses(struct nvidia_par *par); | 36 | void nvidia_delete_i2c_busses(struct nvidia_par *par); |
37 | int nvidia_probe_i2c_connector(struct nvidia_par *par, int conn, | 37 | int nvidia_probe_i2c_connector(struct fb_info *info, int conn, |
38 | u8 ** out_edid); | 38 | u8 ** out_edid); |
39 | #else | 39 | #else |
40 | #define nvidia_create_i2c_busses(...) | 40 | #define nvidia_create_i2c_busses(...) |