aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2005-09-10 20:01:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 20:31:12 -0400
commit2d21247998c5d183179a7e822c4032974a53ff49 (patch)
treeab4819fdfb898db302a6c6383f847085ec706228 /drivers/video/nvidia
parentd3fd4c2d48ac4590a922f2a950a2d46386c97a8a (diff)
[PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
Fix drivers/video/nvidia/nv_of.c:34: error: conflicting types for 'nvidia_probe_i2c_connector' drivers/video/nvidia/nv_proto.h:38: error: previous declaration of 'nvidia_probe_i2c_connector' was here Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Al Viro <viro@ZenIV.linux.org.uk> Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/nvidia')
-rw-r--r--drivers/video/nvidia/nv_of.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index 7d12eb85310d..4fa2cf9a8af2 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -30,8 +30,9 @@
30void nvidia_create_i2c_busses(struct nvidia_par *par) {} 30void nvidia_create_i2c_busses(struct nvidia_par *par) {}
31void nvidia_delete_i2c_busses(struct nvidia_par *par) {} 31void nvidia_delete_i2c_busses(struct nvidia_par *par) {}
32 32
33int nvidia_probe_i2c_connector(struct nvidia_par *par, int conn, u8 **out_edid) 33int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
34{ 34{
35 struct nvidia_par *par = info->par;
35 struct device_node *dp; 36 struct device_node *dp;
36 unsigned char *pedid = NULL; 37 unsigned char *pedid = NULL;
37 unsigned char *disptype = NULL; 38 unsigned char *disptype = NULL;