diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:27 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:27 -0500 |
| commit | ac97d4e00a8356e61806fe7b223c0b7021908577 (patch) | |
| tree | fb20da2e2689ff1f20cd39d9d11de66be6069461 /include | |
| parent | 1d697db0ab270ec8eff4021926283fa552790e6d (diff) | |
| parent | ee2f615d6e59cea2b9a415661a7f27caffcb3528 (diff) | |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/davinci_asp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h index 8db5ae03b6e3..689a856b86f9 100644 --- a/include/linux/platform_data/davinci_asp.h +++ b/include/linux/platform_data/davinci_asp.h | |||
| @@ -84,6 +84,8 @@ struct snd_platform_data { | |||
| 84 | u8 version; | 84 | u8 version; |
| 85 | u8 txnumevt; | 85 | u8 txnumevt; |
| 86 | u8 rxnumevt; | 86 | u8 rxnumevt; |
| 87 | int tx_dma_channel; | ||
| 88 | int rx_dma_channel; | ||
| 87 | }; | 89 | }; |
| 88 | 90 | ||
| 89 | enum { | 91 | enum { |