4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
index 0ecfdc432f87..e895f9f887ab 100644
--- a/drivers/edac/i3000_edac.c
+++ b/drivers/edac/i3000_edac.c
@@ -275,7 +275,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
         unsigned char *c0dra = dra, *c1dra = &dra[I3000_RANKS_PER_CHANNEL / 2];
         unsigned char *c0drb = drb, *c1drb = &drb[I3000_RANKS_PER_CHANNEL];
         unsigned long mchbar;
-        void *window;
+        void __iomem *window;
 
         debugf0("MC: %s()\n", __func__);
 
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index f668d235e6be..bf19ddfa6cda 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -551,8 +551,8 @@ static int setup_mmio_scc (struct pci_dev *dev, const char *name)
         unsigned long dma_base = pci_resource_start(dev, 1);
         unsigned long ctl_size = pci_resource_len(dev, 0);
         unsigned long dma_size = pci_resource_len(dev, 1);
-        void *ctl_addr;
-        void *dma_addr;
+        void __iomem *ctl_addr;
+        void __iomem *dma_addr;
         int i;
 
         for (i = 0; i < MAX_HWIFS; i++) {
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 89facb73edfc..d292a37ec7d6 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -849,7 +849,7 @@ tgafb_clut_imageblit(struct fb_info *info, const struct fb_image *image)
         u32 *palette = ((u32 *)info->pseudo_palette);
         unsigned long pos, line_length, i, j;
         const unsigned char *data;
-        void *regs_base, *fb_base;
+        void __iomem *regs_base, *fb_base;
 
         dx = image->dx;
         dy = image->dy;
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 763bc73e5070..4b696641ce33 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -85,7 +85,7 @@ static struct {
 };
 
 struct ds1wm_data {
-        void            *map;
+        void            __iomem *map;
         int             bus_shift; /* # of shifts to calc register offsets */
         struct platform_device *pdev;
         struct ds1wm_platform_data *pdata;