diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 11:08:24 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 03:32:45 -0400 |
| commit | 1992a6fbd929196aebe95e0e7b04c4da66c3bfec (patch) | |
| tree | 026a5700a8255c3a5d76db98a751c6033f4bcd11 /sound/soc/s3c24xx/s3c2412-i2s.h | |
| parent | 917f93ac80a1c007d4a3ce269a3712f93a75728f (diff) | |
ALSA: asoc: s3c24xx - 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 S3C24xx 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/s3c24xx/s3c2412-i2s.h')
| -rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.h b/sound/soc/s3c24xx/s3c2412-i2s.h index 27f48e1ffa86..aac08a25e541 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.h +++ b/sound/soc/s3c24xx/s3c2412-i2s.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | extern struct clk *s3c2412_get_iisclk(void); | 25 | extern struct clk *s3c2412_get_iisclk(void); |
| 26 | 26 | ||
| 27 | extern struct snd_soc_cpu_dai s3c2412_i2s_dai; | 27 | extern struct snd_soc_dai s3c2412_i2s_dai; |
| 28 | 28 | ||
| 29 | struct s3c2412_rate_calc { | 29 | struct s3c2412_rate_calc { |
| 30 | unsigned int clk_div; /* for prescaler */ | 30 | unsigned int clk_div; /* for prescaler */ |