From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 Apr 2012 02:17:21 +0000 (+1000)
Subject: Merge remote-tracking branch 'dmaengine/next'
X-Git-Tag: next-20120411~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c55108dbe809a164feedecd68204394eda51d7e;p=karo-tx-linux.git

Merge remote-tracking branch 'dmaengine/next'
---

8c55108dbe809a164feedecd68204394eda51d7e
diff --cc drivers/dma/ioat/dma.h
index c7888bccd974,8bebddd189c7..5e8fe01ba69d
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@@ -88,8 -88,9 +88,8 @@@ struct ioatdma_device 
  struct ioat_chan_common {
  	struct dma_chan common;
  	void __iomem *reg_base;
- 	unsigned long last_completion;
+ 	dma_addr_t last_completion;
  	spinlock_t cleanup_lock;
 -	dma_cookie_t completed_cookie;
  	unsigned long state;
  	#define IOAT_COMPLETION_PENDING 0
  	#define IOAT_COMPLETION_ACK 1