summaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-15 10:20:00 +0000
committerMark Brown <broonie@linaro.org>2013-11-15 10:20:00 +0000
commit092d40505202ebc9fdfa5582f469458c7dd62257 (patch)
treec5eef31c3f9dbbf5a127a81e8cb5b6ba252b5ac5 /include/linux/platform_data
parent5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff)
parent12850b8d45cb03239ede6df58ad0022aba3f3dc2 (diff)
downloadcachepc-linux-092d40505202ebc9fdfa5582f469458c7dd62257.tar.gz
cachepc-linux-092d40505202ebc9fdfa5582f469458c7dd62257.zip
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus
Diffstat (limited to 'include/linux/platform_data')
-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 {