diff options
author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 11:08:00 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 03:32:40 -0400 |
commit | 8cf7b2b393b26b9ba1ccbeeb271a88e51d58f3e3 (patch) | |
tree | 4c3c917857fc4a87f6a8f9eb8d036b4cb818e50c /sound/soc/fsl/fsl_dma.h | |
parent | e550e17ffeb8cf8db27724eaf2ad05f77388afb9 (diff) |
ALSA: asoc: fsl - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the Freescale PPC platform.
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/fsl/fsl_dma.h')
-rw-r--r-- | sound/soc/fsl/fsl_dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_dma.h b/sound/soc/fsl/fsl_dma.h index 430a6ce8b0d0..385d4a42603c 100644 --- a/sound/soc/fsl/fsl_dma.h +++ b/sound/soc/fsl/fsl_dma.h | |||
@@ -126,7 +126,7 @@ struct fsl_dma_link_descriptor { | |||
126 | u8 res[4]; /* Reserved */ | 126 | u8 res[4]; /* Reserved */ |
127 | } __attribute__ ((aligned(32), packed)); | 127 | } __attribute__ ((aligned(32), packed)); |
128 | 128 | ||
129 | /* DMA information needed to create a snd_soc_cpu_dai object | 129 | /* DMA information needed to create a snd_soc_dai object |
130 | * | 130 | * |
131 | * ssi_stx_phys: bus address of SSI STX register to use | 131 | * ssi_stx_phys: bus address of SSI STX register to use |
132 | * ssi_srx_phys: bus address of SSI SRX register to use | 132 | * ssi_srx_phys: bus address of SSI SRX register to use |