diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-10-22 02:07:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-10-22 02:07:33 -0700 |
| commit | 4b684d78690cf62ccdffed4180d45884fb261b2e (patch) | |
| tree | 03f8036bd055a5edd314766170fa590d35d97555 | |
| parent | 5f3d1af0c11fb4289ada4e009fc9f623c8a07604 (diff) | |
[ATY]: Fix build on sparc after viro sparse changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 1dba1f972826..213c134b91b4 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -1978,7 +1978,8 @@ int __init atyfb_do_init(void) /* * Map memory-mapped registers. */ - default_par->ati_regbase = addr + 0x7ffc00UL; + default_par->ati_regbase = (void __iomem *) + (addr + 0x7ffc00UL); info->fix.mmio_start = addr + 0x7ffc00UL; /* @@ -2289,7 +2290,8 @@ int __init atyfb_do_init(void) default_par->mmap_map[0].voff + info->fix.smem_len; default_par->mmap_map[1].poff = - default_par->ati_regbase & PAGE_MASK; + ((unsigned long) default_par->ati_regbase & + PAGE_MASK); default_par->mmap_map[1].size = PAGE_SIZE; default_par->mmap_map[1].prot_mask = _PAGE_CACHE; default_par->mmap_map[1].prot_flag = _PAGE_E; |