[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>
This commit is contained in:
Родитель
d3fd4c2d48
Коммит
2d21247998
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче