diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /drivers/dma/intel_mid_dma_regs.h | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'drivers/dma/intel_mid_dma_regs.h')
| -rw-r--r-- | drivers/dma/intel_mid_dma_regs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h index 709fecbdde79..aea5ee88ce03 100644 --- a/drivers/dma/intel_mid_dma_regs.h +++ b/drivers/dma/intel_mid_dma_regs.h | |||
| @@ -174,8 +174,8 @@ union intel_mid_dma_cfg_hi { | |||
| 174 | * @dma: dma device struture pointer | 174 | * @dma: dma device struture pointer |
| 175 | * @busy: bool representing if ch is busy (active txn) or not | 175 | * @busy: bool representing if ch is busy (active txn) or not |
| 176 | * @in_use: bool representing if ch is in use or not | 176 | * @in_use: bool representing if ch is in use or not |
| 177 | * @raw_tfr: raw trf interrupt recieved | 177 | * @raw_tfr: raw trf interrupt received |
| 178 | * @raw_block: raw block interrupt recieved | 178 | * @raw_block: raw block interrupt received |
| 179 | */ | 179 | */ |
| 180 | struct intel_mid_dma_chan { | 180 | struct intel_mid_dma_chan { |
| 181 | struct dma_chan chan; | 181 | struct dma_chan chan; |