diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 03:09:49 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 03:09:49 -0400 |
| commit | 1f3d6dc0be92f0caca937926cca16ec4fdd585a3 (patch) | |
| tree | a12562009ae984dd16ed080af13d0036b88a93a7 /drivers/dma/shdma.h | |
| parent | 5170c051a56244816d948c43592c1b2805ed4f3a (diff) | |
| parent | 949ff5b8d46b5e3435d21b2651ce3a2599208d44 (diff) | |
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 'drivers/dma/shdma.h')
| -rw-r--r-- | drivers/dma/shdma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h index 2b55a276dc5b..0b1d2c105f02 100644 --- a/drivers/dma/shdma.h +++ b/drivers/dma/shdma.h | |||
| @@ -30,7 +30,6 @@ enum dmae_pm_state { | |||
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | struct sh_dmae_chan { | 32 | struct sh_dmae_chan { |
| 33 | dma_cookie_t completed_cookie; /* The maximum cookie completed */ | ||
| 34 | spinlock_t desc_lock; /* Descriptor operation lock */ | 33 | spinlock_t desc_lock; /* Descriptor operation lock */ |
| 35 | struct list_head ld_queue; /* Link descriptors queue */ | 34 | struct list_head ld_queue; /* Link descriptors queue */ |
| 36 | struct list_head ld_free; /* Link descriptors free */ | 35 | struct list_head ld_free; /* Link descriptors free */ |