Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / dma / ioatdma.h

diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h
index a5d3b3644160f686c1737d429fd3a1ec3e64505f..62b26a9be4c9d01cb4d4abb364a1252d1c938c74 100644 (file)
--- a/drivers/dma/ioatdma.h
+++ b/drivers/dma/ioatdma.h
@@ -44,7 +44,7 @@ extern struct list_head dma_client_list;
 
 struct ioat_device {
        struct pci_dev *pdev;
-       void *reg_base;
+       void __iomem *reg_base;
        struct pci_pool *dma_pool;
        struct pci_pool *completion_pool;
 
@@ -73,7 +73,7 @@ struct ioat_device {
 
 struct ioat_dma_chan {
 
-       void *reg_base;
+       void __iomem *reg_base;
 
        dma_cookie_t completed_cookie;
        unsigned long last_completion;