diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 10:54:06 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 10:54:06 -0700 |
| commit | 2c9ee33d37a6f3808c4319f0849671fafa8a6f4c (patch) | |
| tree | 2047f0a8460d7df8d9c96e6924be0bc97ae5d403 /sound/soc/davinci/davinci-pcm.h | |
| parent | 766df6d98f9c28dfc6f72c23a010819719e4c3e0 (diff) | |
| parent | 539d3d8cbe5cf7597d4c4c4428aec242f9ea5185 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.h')
| -rw-r--r-- | sound/soc/davinci/davinci-pcm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h index 63d96253c73..8746606efc8 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 */ |