summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 13:35:02 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 13:35:02 +0900
commit22849e45ffa5f447745c898d1ddbf73543e6caba (patch)
tree32bf5cd6910634d5a3c11aa08951f58598e8947f /include
parent994f2f9ed6e438fd1daa54484d19e07350079b31 (diff)
parent88abfd5b84cc98c839fb7783c59b4c79d63d45e2 (diff)
downloadlinux-22849e45ffa5f447745c898d1ddbf73543e6caba.tar.gz
linux-22849e45ffa5f447745c898d1ddbf73543e6caba.tar.bz2
linux-22849e45ffa5f447745c898d1ddbf73543e6caba.zip
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/davinci_asp.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index d0c5825876f8..f3d6e4f20962 100644
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -16,6 +16,8 @@
#ifndef __DAVINCI_ASP_H
#define __DAVINCI_ASP_H
+#include <linux/genalloc.h>
+
struct snd_platform_data {
u32 tx_dma_offset;
u32 rx_dma_offset;
@@ -30,6 +32,7 @@ struct snd_platform_data {
unsigned enable_channel_combine:1;
unsigned sram_size_playback;
unsigned sram_size_capture;
+ struct gen_pool *sram_pool;
/*
* If McBSP peripheral gets the clock from an external pin,