diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 12:39:49 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 12:39:49 +0530 |
| commit | 1f3d6dc0be92f0caca937926cca16ec4fdd585a3 (patch) | |
| tree | a12562009ae984dd16ed080af13d0036b88a93a7 /arch | |
| parent | 5170c051a56244816d948c43592c1b2805ed4f3a (diff) | |
| parent | 949ff5b8d46b5e3435d21b2651ce3a2599208d44 (diff) | |
| download | linux-3.10-1f3d6dc0be92f0caca937926cca16ec4fdd585a3.tar.gz linux-3.10-1f3d6dc0be92f0caca937926cca16ec4fdd585a3.tar.bz2 linux-3.10-1f3d6dc0be92f0caca937926cca16ec4fdd585a3.zip | |
Merge branch 'rmk_cookie_fixes2' into next
Conflicts:
drivers/dma/imx-dma.c
drivers/dma/pl330.c
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/hardware/iop_adma.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/hardware/iop_adma.h b/arch/arm/include/asm/hardware/iop_adma.h index 59b8c3892f7..122f86d8c99 100644 --- a/arch/arm/include/asm/hardware/iop_adma.h +++ b/arch/arm/include/asm/hardware/iop_adma.h @@ -49,7 +49,6 @@ struct iop_adma_device { /** * struct iop_adma_chan - internal representation of an ADMA device * @pending: allows batching of hardware operations - * @completed_cookie: identifier for the most recently completed operation * @lock: serializes enqueue/dequeue operations to the slot pool * @mmr_base: memory mapped register base * @chain: device chain view of the descriptors @@ -62,7 +61,6 @@ struct iop_adma_device { */ struct iop_adma_chan { int pending; - dma_cookie_t completed_cookie; spinlock_t lock; /* protects the descriptor slot pool */ void __iomem *mmr_base; struct list_head chain; |