]> err.no Git - linux-2.6/commitdiff
[PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
authorAlexey Dobriyan <adobriyan@gmail.com>
Sun, 11 Sep 2005 00:01:09 +0000 (04:01 +0400)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 00:31:12 +0000 (17:31 -0700)
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>
drivers/video/nvidia/nv_of.c

index 7d12eb85310de04c9043d4408dda2d005a92c4da..4fa2cf9a8af2adbf6e673022ea2655c9810e5de6 100644 (file)
@@ -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;