[PATCH] misc iomem annotations

Each chunk is independent from the rest, so it could've been split
further, but IMO there's no point.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/char/epca.h

@@ -149,7 +149,7 @@ struct board_info
 	ushort numports;
 	unchar *port;
 	unchar *membase;
-	unchar *re_map_port;
+	unchar __iomem *re_map_port;
 	unchar *re_map_membase;
 	ulong  memory_seg;
 	void ( * memwinon )	(struct board_info *, unsigned int) ;

drivers/char/hw_random.c

@@ -191,7 +191,7 @@ MODULE_DEVICE_TABLE (pci, rng_pci_tbl);
 #define INTEL_RNG_ADDR_LEN			3
 
 /* token to our ioremap'd RNG register area */
-static void *rng_mem;
+static void __iomem *rng_mem;
 
 static inline u8 intel_hwstatus (void)
 {

drivers/char/watchdog/sc520_wdt.c

@@ -122,7 +122,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CON
 #define WDT_WRST_ENB	0x4000	/* [14] Watchdog Timer Reset Enable */
 #define WDT_ENB		0x8000	/* [15] Watchdog Timer Enable */
 
-static __u16 *wdtmrctl;
+static __u16 __iomem *wdtmrctl;
 
 static void wdt_timer_ping(unsigned long);
 static struct timer_list timer;

drivers/ide/pci/pdc202xx_new.c

@@ -239,7 +239,7 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev)
 {
 	struct device_node *np = pci_device_to_OF_node(pdev);
 	unsigned int class_rev = 0;
-	unsigned long mmio;
+	void __iomem *mmio;
 	u8 conf;
 
 	if (np == NULL || !device_is_compatible(np, "kiwi-root"))
@@ -253,7 +253,7 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev)
 		pci_read_config_byte(pdev, 0x40, &conf);
 		pci_write_config_byte(pdev, 0x40, conf | 0x01);
 	}
-	mmio = (unsigned long)ioremap(pci_resource_start(pdev, 5),
+	mmio = ioremap(pci_resource_start(pdev, 5),
 				      pci_resource_len(pdev, 5));
 
 	/* Setup some PLL stuffs */
@@ -268,7 +268,7 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev)
 		break;
 	}
 
-	iounmap((void *)mmio);
+	iounmap(mmio);
 }
 #endif /* CONFIG_PPC_PMAC */
 

drivers/pci/hotplug/cpqphp_nvram.c

@@ -92,7 +92,7 @@ static u8 evbuffer_init;
 static u8 evbuffer_length;
 static u8 evbuffer[1024];
 
-static void *compaq_int15_entry_point;
+static void __iomem *compaq_int15_entry_point;
 
 static spinlock_t int15_lock;		/* lock for ordering int15_bios_call() */