Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d212479 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[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: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Acked-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d3fd4c2d

drivers/video/nvidia/nv_of.c

+2 −1
Original line number Diff line number Diff line
@@ -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;