Skip to content

Commit

Permalink
[PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware E…
Browse files Browse the repository at this point in the history
…DID"

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>
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Sep 11, 2005
1 parent d3fd4c2 commit 2d21247
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/video/nvidia/nv_of.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@
void nvidia_create_i2c_busses(struct nvidia_par *par) {}
void nvidia_delete_i2c_busses(struct nvidia_par *par) {}

int nvidia_probe_i2c_connector(struct nvidia_par *par, int conn, u8 **out_edid)
int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
{
struct nvidia_par *par = info->par;
struct device_node *dp;
unsigned char *pedid = NULL;
unsigned char *disptype = NULL;
Expand Down

0 comments on commit 2d21247

Please sign in to comment.