Atyfb: kill assignment warnings on Atari due to __iomem changes
--- linux-2.6.10-rc1/drivers/video/aty/atyfb_base.c.orig 2004-10-23 10:33:27.000000000 +0200
+++ linux-2.6.10-rc1/drivers/video/aty/atyfb_base.c 2004-10-24 12:59:07.000000000 +0200
@@ -2344,9 +2344,9 @@ int __init atyfb_do_init(void)
info->screen_base = ioremap(phys_vmembase[m64_num],
phys_size[m64_num]);
info->fix.smem_start = (unsigned long)info->screen_base; /* Fake! */
- default_par->ati_regbase = (unsigned long)ioremap(phys_guiregbase[m64_num],
- 0x10000) + 0xFC00ul;
- info->fix.mmio_start = default_par->ati_regbase; /* Fake! */
+ default_par->ati_regbase = ioremap(phys_guiregbase[m64_num],
+ 0x10000) + 0xFC00ul;
+ info->fix.mmio_start = (unsigned long)default_par->ati_regbase; /* Fake! */
aty_st_le32(CLOCK_CNTL, 0x12345678, default_par);
clock_r = aty_ld_le32(CLOCK_CNTL, default_par);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Sunday 24 October 2004 19:15, Geert Uytterhoeven wrote:
> Atyfb: kill assignment warnings on Atari due to __iomem changes
I pushed a big mach64 patch (coming from various authors) to Andrew, and
this will get rejected.
Attached is an incremental patch for the big mach64 update.
Signed-off-by: Antonino Daplas <[email protected]>
---
---diff -Nru a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
--- a/drivers/video/aty/atyfb_base.c 2004-10-22 15:57:58 +08:00
+++ b/drivers/video/aty/atyfb_base.c 2004-10-24 20:26:04 +08:00
@@ -3457,8 +3457,10 @@
*/
info->screen_base = ioremap(phys_vmembase[m64_num], phys_size[m64_num]);
info->fix.smem_start = (unsigned long)info->screen_base; /* Fake! */
- par->ati_regbase = ioremap(phys_guiregbase[m64_num], 0x10000) + 0xFC00ul;
- info->fix.mmio_start = par->ati_regbase; /* Fake! */
+ par->ati_regbase = ioremap(phys_guiregbase[m64_num],
+ 0x10000) + 0xFC00ul;
+ info->fix.mmio_start =
+ (unsigned long)par->ati_regbase; /* Fake! */
aty_st_le32(CLOCK_CNTL, 0x12345678, par);
clock_r = aty_ld_le32(CLOCK_CNTL, par);