summaryrefslogtreecommitdiff
path: root/sound/soc/davinci/davinci-pcm.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-11-16 13:33:41 +0300
committerTakashi Iwai <tiwai@suse.de>2009-11-16 13:33:41 +0300
commitfe705ab1526bc2c8b7756f3a855f040ab2060af2 (patch)
treec4444d19983c5578f9ef2bddc1fa01b6e42f91a3 /sound/soc/davinci/davinci-pcm.h
parent7d1794e81b5f202c73d7e3e65f0ee7aae4928038 (diff)
parentad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff)
downloadlinux-fe705ab1526bc2c8b7756f3a855f040ab2060af2.tar.xz
Merge branch 'topic/beep-rename' into topic/hda
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.h')
-rw-r--r--sound/soc/davinci/davinci-pcm.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index 63d96253c73a..8746606efc89 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -17,7 +17,6 @@
struct davinci_pcm_dma_params {
- char *name; /* stream identifier */
int channel; /* sync dma channel ID */
unsigned short acnt;
dma_addr_t dma_addr; /* device physical address for DMA */