diff options
-rw-r--r-- | arch/m68k/mm/sun3kmap.c | 8 | ||||
-rw-r--r-- | drivers/net/sun3_82586.c | 2 | ||||
-rw-r--r-- | drivers/net/sun3lance.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68k/mm/sun3kmap.c b/arch/m68k/mm/sun3kmap.c index 7f0d86f3fe73..8caa45908cb1 100644 --- a/arch/m68k/mm/sun3kmap.c +++ b/arch/m68k/mm/sun3kmap.c | |||
@@ -59,7 +59,7 @@ static inline void do_pmeg_mapin(unsigned long phys, unsigned long virt, | |||
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
62 | void *sun3_ioremap(unsigned long phys, unsigned long size, | 62 | void __iomem *sun3_ioremap(unsigned long phys, unsigned long size, |
63 | unsigned long type) | 63 | unsigned long type) |
64 | { | 64 | { |
65 | struct vm_struct *area; | 65 | struct vm_struct *area; |
@@ -101,19 +101,19 @@ void *sun3_ioremap(unsigned long phys, unsigned long size, | |||
101 | virt += seg_pages * PAGE_SIZE; | 101 | virt += seg_pages * PAGE_SIZE; |
102 | } | 102 | } |
103 | 103 | ||
104 | return (void *)ret; | 104 | return (void __iomem *)ret; |
105 | 105 | ||
106 | } | 106 | } |
107 | 107 | ||
108 | 108 | ||
109 | void *__ioremap(unsigned long phys, unsigned long size, int cache) | 109 | void __iomem *__ioremap(unsigned long phys, unsigned long size, int cache) |
110 | { | 110 | { |
111 | 111 | ||
112 | return sun3_ioremap(phys, size, SUN3_PAGE_TYPE_IO); | 112 | return sun3_ioremap(phys, size, SUN3_PAGE_TYPE_IO); |
113 | 113 | ||
114 | } | 114 | } |
115 | 115 | ||
116 | void iounmap(void *addr) | 116 | void iounmap(void __iomem *addr) |
117 | { | 117 | { |
118 | vfree((void *)(PAGE_MASK & (unsigned long)addr)); | 118 | vfree((void *)(PAGE_MASK & (unsigned long)addr)); |
119 | } | 119 | } |
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c index d1d1885b0295..a3220a96524f 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/sun3_82586.c | |||
@@ -330,7 +330,7 @@ out2: | |||
330 | out1: | 330 | out1: |
331 | free_netdev(dev); | 331 | free_netdev(dev); |
332 | out: | 332 | out: |
333 | iounmap((void *)ioaddr); | 333 | iounmap((void __iomem *)ioaddr); |
334 | return ERR_PTR(err); | 334 | return ERR_PTR(err); |
335 | } | 335 | } |
336 | 336 | ||
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 91c76544e4dd..b865db363ba0 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
@@ -286,7 +286,7 @@ struct net_device * __init sun3lance_probe(int unit) | |||
286 | 286 | ||
287 | out1: | 287 | out1: |
288 | #ifdef CONFIG_SUN3 | 288 | #ifdef CONFIG_SUN3 |
289 | iounmap((void *)dev->base_addr); | 289 | iounmap((void __iomem *)dev->base_addr); |
290 | #endif | 290 | #endif |
291 | out: | 291 | out: |
292 | free_netdev(dev); | 292 | free_netdev(dev); |
@@ -326,7 +326,7 @@ static int __init lance_probe( struct net_device *dev) | |||
326 | ioaddr_probe[1] = tmp2; | 326 | ioaddr_probe[1] = tmp2; |
327 | 327 | ||
328 | #ifdef CONFIG_SUN3 | 328 | #ifdef CONFIG_SUN3 |
329 | iounmap((void *)ioaddr); | 329 | iounmap((void __iomem *)ioaddr); |
330 | #endif | 330 | #endif |
331 | return 0; | 331 | return 0; |
332 | } | 332 | } |
@@ -956,7 +956,7 @@ void cleanup_module(void) | |||
956 | { | 956 | { |
957 | unregister_netdev(sun3lance_dev); | 957 | unregister_netdev(sun3lance_dev); |
958 | #ifdef CONFIG_SUN3 | 958 | #ifdef CONFIG_SUN3 |
959 | iounmap((void *)sun3lance_dev->base_addr); | 959 | iounmap((void __iomem *)sun3lance_dev->base_addr); |
960 | #endif | 960 | #endif |
961 | free_netdev(sun3lance_dev); | 961 | free_netdev(sun3lance_dev); |
962 | } | 962 | } |