diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-04-20 21:51:14 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-04-20 21:51:14 +0300 |
| commit | b53c7582805b10d6a32e88e22d16dc469e66a37a (patch) | |
| tree | 3775742e873f18d005fd8c2187411ead06c0049d /include/linux/shdma-base.h | |
| parent | 7d3beab16dd9eee86bb1a4dd05b51159fc7772f0 (diff) | |
| parent | 3cd44dcd35a6618df88c51561290dc02fb35b8e2 (diff) | |
| download | linux-b53c7582805b10d6a32e88e22d16dc469e66a37a.tar.xz | |
Merge branch 'topic/sh' into for-linus
Diffstat (limited to 'include/linux/shdma-base.h')
| -rw-r--r-- | include/linux/shdma-base.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h index abdf1f229dc3..dd0ba502ccb3 100644 --- a/include/linux/shdma-base.h +++ b/include/linux/shdma-base.h @@ -69,6 +69,7 @@ struct shdma_chan { int id; /* Raw id of this channel */ int irq; /* Channel IRQ */ int slave_id; /* Client ID for slave DMA */ + int real_slave_id; /* argument passed to filter function */ int hw_req; /* DMA request line for slave DMA - same * as MID/RID, used with DT */ enum shdma_pm_state pm_state; |