diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
| commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c (patch) | |
| tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 /sound/soc/blackfin/bf5xx-ssm2602.c | |
| parent | f1992dde7fef6713a469a5a142b86812b8a47f9e (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7
Conflicts):
drivers/base/regmap/regmap.c (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ssm2602.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ssm2602.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c index 911edbab1345..7dbeef1099b4 100644 --- a/sound/soc/blackfin/bf5xx-ssm2602.c +++ b/sound/soc/blackfin/bf5xx-ssm2602.c | |||
| @@ -70,6 +70,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { | |||
| 70 | .platform_name = "bfin-i2s-pcm-audio", | 70 | .platform_name = "bfin-i2s-pcm-audio", |
| 71 | .codec_name = "ssm2602.0-001b", | 71 | .codec_name = "ssm2602.0-001b", |
| 72 | .init = bf5xx_ssm2602_dai_init, | 72 | .init = bf5xx_ssm2602_dai_init, |
| 73 | .dai_fmt = BF5XX_SSM2602_DAIFMT, | ||
| 73 | }, | 74 | }, |
| 74 | { | 75 | { |
| 75 | .name = "ssm2602", | 76 | .name = "ssm2602", |
| @@ -79,6 +80,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { | |||
| 79 | .platform_name = "bfin-i2s-pcm-audio", | 80 | .platform_name = "bfin-i2s-pcm-audio", |
| 80 | .codec_name = "ssm2602.0-001b", | 81 | .codec_name = "ssm2602.0-001b", |
| 81 | .init = bf5xx_ssm2602_dai_init, | 82 | .init = bf5xx_ssm2602_dai_init, |
| 83 | .dai_fmt = BF5XX_SSM2602_DAIFMT, | ||
| 82 | }, | 84 | }, |
| 83 | }; | 85 | }; |
| 84 | 86 | ||