diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 13:54:51 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 13:54:51 +0000 |
commit | 41b51dd47ea7c406a8d49b97804e8acec9dadaed (patch) | |
tree | 97c2d4f303a2c575582c2882d4c3b79f880e254a /sound/soc/codecs/tlv320aic23.c | |
parent | 1452556bebc302121eea5dfb3cbd464824406bb8 (diff) | |
parent | bab0212467e58929470ae3ae32515f17e30c3926 (diff) | |
download | op-kernel-dev-41b51dd47ea7c406a8d49b97804e8acec9dadaed.zip op-kernel-dev-41b51dd47ea7c406a8d49b97804e8acec9dadaed.tar.gz |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs/tlv320aic23.c')
-rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 1709e3f..a091ce7 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -265,8 +265,8 @@ static const int bosr_usb_divisor_table[] = { #define UPPER_GROUP ((1<<8) | (1<<9) | (1<<10) | (1<<11) | (1<<15)) static const unsigned short sr_valid_mask[] = { LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 0*/ - LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/ LOWER_GROUP, /* Usb, bosr - 0*/ + LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/ UPPER_GROUP, /* Usb, bosr - 1*/ }; /* |