Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
diff mbox series

Message ID 20050910225307.GA7654@mipter.zuzino.mipt.ru
State New, archived
Headers show
Series
  • Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
Related show

Commit Message

Alexey Dobriyan Sept. 10, 2005, 10:53 p.m. UTC
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>
---

 drivers/video/nvidia/nv_of.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Comments

Al Viro Sept. 10, 2005, 10:51 p.m. UTC | #1
On Sun, Sep 11, 2005 at 02:53:07AM +0400, Alexey Dobriyan wrote:
> 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>

ACK (and merged in -bird, but I hope it gets into Linus' tree before the
final rediff for today ;-)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Antonino A. Daplas Sept. 10, 2005, 11:26 p.m. UTC | #2
Alexey Dobriyan wrote:
> 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>

Thanks.

Acked-by: Antonino Daplas <adaplas@pol.net>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Patch
diff mbox series

--- linux-vanilla/drivers/video/nvidia/nv_of.c
+++ linux-nvidia/drivers/video/nvidia/nv_of.c
@@ -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;