Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[powerpc.git] / drivers / dma / ioatdma.h

diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h
index 312353d..62b26a9 100644 (file)
--- a/drivers/dma/ioatdma.h
+++ b/drivers/dma/ioatdma.h
@@ -26,8 +26,7 @@
 #include <linux/init.h>
 #include <linux/dmapool.h>
 #include <linux/cache.h>
-
-#define PCI_DEVICE_ID_INTEL_IOAT       0x1a38
+#include <linux/pci_ids.h>
 
 #define IOAT_LOW_COMPLETION_MASK       0xffffffc0
 
@@ -45,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;
 
@@ -74,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;