summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:24:04 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:24:04 +0100
commitcf44fba0899152daf481dfc7fde53e53f0d50141 (patch)
tree964346fcab3e808fff58a65ae977cb5836c563a5 /include
parent07056901106b71c69623a224bbb16e83585e5530 (diff)
parentee2f615d6e59cea2b9a415661a7f27caffcb3528 (diff)
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 {