From: Alexey Dobriyan <adobriyan@gmail.com>
To: Antonino Daplas <adaplas@pol.net>, Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"
Date: Sun, 11 Sep 2005 02:53:07 +0400 [thread overview]
Message-ID: <20050910225307.GA7654@mipter.zuzino.mipt.ru> (raw)
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;
next reply other threads:[~2005-09-10 22:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-10 22:53 Alexey Dobriyan [this message]
2005-09-10 22:51 ` [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID" Al Viro
2005-09-10 23:26 ` Antonino A. Daplas
2005-09-11 0:01 ` Alexey Dobriyan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050910225307.GA7654@mipter.zuzino.mipt.ru \
--to=adobriyan@gmail.com \
--cc=adaplas@pol.net \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).