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/mingo/linux-2.6-sched
[powerpc.git]
/
drivers
/
dma
/
ioatdma.h
diff --git
a/drivers/dma/ioatdma.h
b/drivers/dma/ioatdma.h
index
2a319e1
..
5f9881e
100644
(file)
--- a/
drivers/dma/ioatdma.h
+++ b/
drivers/dma/ioatdma.h
@@
-28,6
+28,8
@@
#include <linux/cache.h>
#include <linux/pci_ids.h>
#include <linux/cache.h>
#include <linux/pci_ids.h>
+#define IOAT_DMA_VERSION "1.26"
+
enum ioat_interrupt {
none = 0,
msix_multi_vector = 1,
enum ioat_interrupt {
none = 0,
msix_multi_vector = 1,
@@
-122,9
+124,9
@@
struct ioat_desc_sw {
struct ioat_dma_descriptor *hw;
struct list_head node;
int tx_cnt;
struct ioat_dma_descriptor *hw;
struct list_head node;
int tx_cnt;
- DECLARE_PCI_UNMAP_LEN(len)
- DECLARE_PCI_UNMAP_ADDR(src)
- DECLARE_PCI_UNMAP_ADDR(dst)
+ size_t len;
+ dma_addr_t src;
+ dma_addr_t dst;
struct dma_async_tx_descriptor async_tx;
};
struct dma_async_tx_descriptor async_tx;
};