From: Andrew Morton <akpm@osdl.org>
To: adaplas@pol.net, adaplas@hotpop.com,
linux-fbdev-devel@lists.sourceforge.net, alex.kern@gmx.de,
arnaud.fontaine@free.fr, geert@linux-m68k.org,
jsimmons@infradead.org, nsouch@free.fr, syrjala@sci.fi
Subject: Re: [PATCH 3/5] fbdev: Various mach64 changes
Date: Fri, 22 Oct 2004 00:57:22 -0700 [thread overview]
Message-ID: <20041022005722.6f90d3c4.akpm@osdl.org> (raw)
In-Reply-To: <20041022005531.28218795.akpm@osdl.org>
Actually, I'll use the below patch just to make it compile.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-sparc64-akpm/drivers/video/aty/atyfb_base.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff -puN drivers/video/aty/atyfb_base.c~fbdev-various-mach64-changes-sparc64-fix drivers/video/aty/atyfb_base.c
--- 25-sparc64/drivers/video/aty/atyfb_base.c~fbdev-various-mach64-changes-sparc64-fix 2004-10-22 00:47:03.000000000 -0700
+++ 25-sparc64-akpm/drivers/video/aty/atyfb_base.c 2004-10-22 00:56:18.377055112 -0700
@@ -2746,9 +2746,11 @@ static int atyfb_setcolreg(u_int regno,
#ifdef __sparc__
-static int __devinit atyfb_setup_sparc(struct pci_dev *pdev, struct fb_indo *info, unsigned long addr)
+extern void (*prom_palette) (int);
+
+static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
+ struct fb_info *info, unsigned long addr)
{
- extern void (*prom_palette) (int);
extern int con_is_present(void);
struct atyfb_par *par = info->par;
@@ -2764,7 +2766,7 @@ static int __devinit atyfb_setup_sparc(s
/*
* Map memory-mapped registers.
*/
- par->ati_regbase = addr + 0x7ffc00UL;
+ par->ati_regbase = (void *)addr + 0x7ffc00UL;
info->fix.mmio_start = addr + 0x7ffc00UL;
/*
@@ -2782,7 +2784,7 @@ static int __devinit atyfb_setup_sparc(s
j = i + 4;
par->mmap_map = kmalloc(j * sizeof(*par->mmap_map), GFP_ATOMIC);
- if (!_par->mmap_map) {
+ if (!par->mmap_map) {
PRINTKE("atyfb_setup_sparc() can't alloc mmap_map\n");
return -ENOMEM;
}
@@ -3394,7 +3396,7 @@ static int __devinit atyfb_pci_probe(str
par->mmap_map[0].prot_mask = _PAGE_CACHE;
par->mmap_map[0].prot_flag = _PAGE_E;
par->mmap_map[1].voff = par->mmap_map[0].voff + info->fix.smem_len;
- par->mmap_map[1].poff = par->ati_regbase & PAGE_MASK;
+ par->mmap_map[1].poff = (long)par->ati_regbase & PAGE_MASK;
par->mmap_map[1].size = PAGE_SIZE;
par->mmap_map[1].prot_mask = _PAGE_CACHE;
par->mmap_map[1].prot_flag = _PAGE_E;
_
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
prev parent reply other threads:[~2004-10-22 7:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-20 0:15 [PATCH 3/5] fbdev: Various mach64 changes Antonino A. Daplas
2004-10-22 7:55 ` Andrew Morton
2004-10-22 7:57 ` Andrew Morton [this message]
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=20041022005722.6f90d3c4.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=adaplas@hotpop.com \
--cc=adaplas@pol.net \
--cc=alex.kern@gmx.de \
--cc=arnaud.fontaine@free.fr \
--cc=geert@linux-m68k.org \
--cc=jsimmons@infradead.org \
--cc=linux-fbdev-devel@lists.sourceforge.net \
--cc=nsouch@free.fr \
--cc=syrjala@sci.fi \
/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).