diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 11:35:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 11:35:43 +0000 |
| commit | dfa7c70b04bb20df7936018c737014655bf92d09 (patch) | |
| tree | f5eb47ca770d70fe2d55006bc1a4e552b964c422 /sound/soc/s6000/s6000-i2s.c | |
| parent | 551102762ebe8bc0aa867d28960d9be97bbe17c1 (diff) | |
| parent | b76fb39d49f67a484a6adc8f041d9ad833f6860e (diff) | |
| download | kernel_samsung_crespo-dfa7c70b04bb20df7936018c737014655bf92d09.zip kernel_samsung_crespo-dfa7c70b04bb20df7936018c737014655bf92d09.tar.gz kernel_samsung_crespo-dfa7c70b04bb20df7936018c737014655bf92d09.tar.bz2 | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/s6000/s6000-i2s.c')
| -rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index 8778faa..3052f64 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c @@ -434,7 +434,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { .rate_max = 1562500, }, .ops = &s6000_i2s_dai_ops, -} +}; static int __devinit s6000_i2s_probe(struct platform_device *pdev) { |