diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 09:40:31 +0300 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 09:40:31 +0300 |
commit | b5c00a3a412857d6f07970984068c450429e051c (patch) | |
tree | 1fde50630cbc24e11a45169f717f281db8eb6dcc /sound/soc/davinci/davinci-pcm.h | |
parent | ca6f2d7fafd2d48b2f6943f5c6787beaec2014d0 (diff) | |
parent | 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff) | |
download | linux-b5c00a3a412857d6f07970984068c450429e051c.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.h')
-rw-r--r-- | sound/soc/davinci/davinci-pcm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h index 8746606efc89..0764944cf10f 100644 --- a/sound/soc/davinci/davinci-pcm.h +++ b/sound/soc/davinci/davinci-pcm.h @@ -20,9 +20,11 @@ struct davinci_pcm_dma_params { int channel; /* sync dma channel ID */ unsigned short acnt; dma_addr_t dma_addr; /* device physical address for DMA */ + unsigned sram_size; enum dma_event_q eventq_no; /* event queue number */ unsigned char data_type; /* xfer data type */ unsigned char convert_mono_stereo; + unsigned int fifo_level; }; |