diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-10-03 12:31:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-10-03 12:31:22 -0400 |
| commit | a1cb9cd69750d6d62251393738efc02d252b67d3 (patch) | |
| tree | 5c68b23180e6ca127d1048cdbf723ca447551123 /sound/soc/davinci/davinci-pcm.h | |
| parent | 08d1e635089f41e28fec644a8620a0e8d66b1235 (diff) | |
| parent | 834eb6c599a8efa1fe9b77d469562e0c78c876e1 (diff) | |
Merge branch 'fix/asoc' into for-linus
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 63d96253c73a..8746606efc89 100644 --- a/sound/soc/davinci/davinci-pcm.h +++ b/sound/soc/davinci/davinci-pcm.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | struct davinci_pcm_dma_params { | 19 | struct davinci_pcm_dma_params { |
| 20 | char *name; /* stream identifier */ | ||
| 21 | int channel; /* sync dma channel ID */ | 20 | int channel; /* sync dma channel ID */ |
| 22 | unsigned short acnt; | 21 | unsigned short acnt; |
| 23 | dma_addr_t dma_addr; /* device physical address for DMA */ | 22 | dma_addr_t dma_addr; /* device physical address for DMA */ |