diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-11-18 18:38:58 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-18 18:38:58 +0300 |
commit | e2cd52e60726c30fa558cead7bc7413fd946261c (patch) | |
tree | 9816475da36eac9d0e7e9f129f0a659ab7286015 /sound/soc/codecs/tlv320aic23.c | |
parent | ef4b18e2af09b69b5a183ad611f5965ef1766be4 (diff) | |
parent | bab0212467e58929470ae3ae32515f17e30c3926 (diff) | |
download | linux-e2cd52e60726c30fa558cead7bc7413fd946261c.tar.xz |
Merge branch 'fix/asoc' into for-linus
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 0b8dcb5cd729..6b24d8bb02bb 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*/ }; /* |