summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-08 10:43:27 +0000
committerMark Brown <broonie@linaro.org>2013-11-08 10:43:27 +0000
commitac97d4e00a8356e61806fe7b223c0b7021908577 (patch)
treefb20da2e2689ff1f20cd39d9d11de66be6069461 /include
parent1d697db0ab270ec8eff4021926283fa552790e6d (diff)
parentee2f615d6e59cea2b9a415661a7f27caffcb3528 (diff)
downloadlinux-ac97d4e00a8356e61806fe7b223c0b7021908577.tar.bz2
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/davinci_asp.h2
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 {
u8 version;
u8 txnumevt;
u8 rxnumevt;
+ int tx_dma_channel;
+ int rx_dma_channel;
};
enum {