diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2005-09-11 04:01:09 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 17:31:12 -0700 |
| commit | 2d21247998c5d183179a7e822c4032974a53ff49 (patch) | |
| tree | ab4819fdfb898db302a6c6383f847085ec706228 /drivers/video | |
| parent | d3fd4c2d48ac4590a922f2a950a2d46386c97a8a (diff) | |
| download | linux-2d21247998c5d183179a7e822c4032974a53ff49.tar.gz linux-2d21247998c5d183179a7e822c4032974a53ff49.tar.bz2 linux-2d21247998c5d183179a7e822c4032974a53ff49.zip | |
[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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/nvidia/nv_of.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c index 7d12eb85310d..4fa2cf9a8af2 100644 --- a/drivers/video/nvidia/nv_of.c +++ b/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; |