Merge branch 'dmaengine' into async-tx-next

[karo-tx-linux.git] / drivers / dma / ioat / dma_v2.h

diff --git a/drivers/dma/ioat/dma_v2.h b/drivers/dma/ioat/dma_v2.h
index 246e646b1904d0a9f402d5ff6cf28a0a35a3b651..1d849ef74d5f7ff3a14bc7350ce58ce7d42be9c8 100644 (file)
--- a/drivers/dma/ioat/dma_v2.h
+++ b/drivers/dma/ioat/dma_v2.h
@@ -142,8 +142,8 @@ struct ioat_ring_ent {
                struct ioat_pq_update_descriptor *pqu;
                struct ioat_raw_descriptor *raw;
        };
-       struct dma_async_tx_descriptor txd;
        size_t len;
+       struct dma_async_tx_descriptor txd;
        enum sum_check_flags *result;
        #ifdef DEBUG
        int id;
@@ -186,4 +186,5 @@ void __ioat2_issue_pending(struct ioat2_dma_chan *ioat);
 void ioat2_cleanup_tasklet(unsigned long data);
 void ioat2_timer_event(unsigned long data);
 extern struct kobj_type ioat2_ktype;
+extern struct kmem_cache *ioat2_cache;
 #endif /* IOATDMA_V2_H */