diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
| commit | 102084d3d3969646cc89ea159e50898aeafc6649 (patch) | |
| tree | e92924469b3fab3ee6fa29e338e0a3a4cb167e82 /sound/soc/codecs/arizona.c | |
| parent | 6ccbe607132bd823abbad8d32b13af89161707da (diff) | |
| parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7
Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'sound/soc/codecs/arizona.c')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 5c9cacaf2d52..1cf7a32d1b21 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
| @@ -426,7 +426,7 @@ static const int arizona_44k1_bclk_rates[] = { | |||
| 426 | 940800, | 426 | 940800, |
| 427 | 1411200, | 427 | 1411200, |
| 428 | 1881600, | 428 | 1881600, |
| 429 | 2882400, | 429 | 2822400, |
| 430 | 3763200, | 430 | 3763200, |
| 431 | 5644800, | 431 | 5644800, |
| 432 | 7526400, | 432 | 7526400, |