diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 05:45:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 05:45:07 -0400 |
| commit | 15d47763b354256053c390a9b7bc9f2b4f197711 (patch) | |
| tree | 6f516e0d3a3d5fb0174d06dfd6db268f4eb5b8ed /sound/soc/codecs/wm2200.c | |
| parent | 0ff97ebf0804d2e519d578fcb4db03f104d2ca8c (diff) | |
| parent | d66a547cddb9124cea6308c33e1f54c7c8db288f (diff) | |
Merge branch 'for-3.5' into for-3.6
Diffstat (limited to 'sound/soc/codecs/wm2200.c')
| -rw-r--r-- | sound/soc/codecs/wm2200.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index acbdc5fde92..32682c1b7cd 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c | |||
| @@ -1491,6 +1491,7 @@ static int wm2200_bclk_rates_dat[WM2200_NUM_BCLK_RATES] = { | |||
| 1491 | 1491 | ||
| 1492 | static int wm2200_bclk_rates_cd[WM2200_NUM_BCLK_RATES] = { | 1492 | static int wm2200_bclk_rates_cd[WM2200_NUM_BCLK_RATES] = { |
| 1493 | 5644800, | 1493 | 5644800, |
| 1494 | 3763200, | ||
| 1494 | 2882400, | 1495 | 2882400, |
| 1495 | 1881600, | 1496 | 1881600, |
| 1496 | 1411200, | 1497 | 1411200, |