* [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
@ 2005-09-10 22:53 Alexey Dobriyan
2005-09-10 22:51 ` Al Viro
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alexey Dobriyan @ 2005-09-10 22:53 UTC (permalink / raw)
To: Antonino Daplas, Al Viro; +Cc: linux-kernel
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(-)
--- 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;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
2005-09-10 22:53 [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID" Alexey Dobriyan
@ 2005-09-10 22:51 ` Al Viro
2005-09-10 23:26 ` Antonino A. Daplas
2005-09-11 0:01 ` Alexey Dobriyan
2 siblings, 0 replies; 4+ messages in thread
From: Al Viro @ 2005-09-10 22:51 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Antonino Daplas, linux-kernel
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 ;-)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
2005-09-10 22:53 [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID" Alexey Dobriyan
2005-09-10 22:51 ` Al Viro
@ 2005-09-10 23:26 ` Antonino A. Daplas
2005-09-11 0:01 ` Alexey Dobriyan
2 siblings, 0 replies; 4+ messages in thread
From: Antonino A. Daplas @ 2005-09-10 23:26 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Antonino Daplas, Al Viro, linux-kernel
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>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
2005-09-10 22:53 [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID" Alexey Dobriyan
2005-09-10 22:51 ` Al Viro
2005-09-10 23:26 ` Antonino A. Daplas
@ 2005-09-11 0:01 ` Alexey Dobriyan
2 siblings, 0 replies; 4+ messages in thread
From: Alexey Dobriyan @ 2005-09-11 0:01 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
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>
---
drivers/video/nvidia/nv_of.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- 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;
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-09-10 23:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-09-10 22:53 [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID" Alexey Dobriyan
2005-09-10 22:51 ` Al Viro
2005-09-10 23:26 ` Antonino A. Daplas
2005-09-11 0:01 ` Alexey Dobriyan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®