projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
[powerpc.git]
/
drivers
/
dma
/
ioatdma.h
diff --git
a/drivers/dma/ioatdma.h
b/drivers/dma/ioatdma.h
index
a5d3b36
..
62b26a9
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;
struct ioat_device {
struct pci_dev *pdev;
- void *reg_base;
+ void
__iomem
*reg_base;
struct pci_pool *dma_pool;
struct pci_pool *completion_pool;
struct pci_pool *dma_pool;
struct pci_pool *completion_pool;
@@
-73,7
+73,7
@@
struct ioat_device {
struct ioat_dma_chan {
struct ioat_dma_chan {
- void *reg_base;
+ void
__iomem
*reg_base;
dma_cookie_t completed_cookie;
unsigned long last_completion;
dma_cookie_t completed_cookie;
unsigned long last_completion;