summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8903.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-25 13:58:37 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-25 13:58:37 +0100
commitd5fc3b5fe374f24b6773c22e90ef4bdda718b845 (patch)
tree3d8f2cfe059e418ad7eb37ababbc2f2cafe213c6 /sound/soc/codecs/wm8903.c
parente2f551dacbdff8e40365a989ab66104b03316f4d (diff)
parentdd5e8e6b1d4c218d2bafe002231ec460459ab5c4 (diff)
downloadlinux-stable-d5fc3b5fe374f24b6773c22e90ef4bdda718b845.tar.gz
linux-stable-d5fc3b5fe374f24b6773c22e90ef4bdda718b845.tar.bz2
linux-stable-d5fc3b5fe374f24b6773c22e90ef4bdda718b845.zip
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r--sound/soc/codecs/wm8903.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 6239af8fdf71..c9baeae3e275 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1255,22 +1255,18 @@ static struct {
int div;
} bclk_divs[] = {
{ 10, 0 },
- { 15, 1 },
{ 20, 2 },
{ 30, 3 },
{ 40, 4 },
{ 50, 5 },
- { 55, 6 },
{ 60, 7 },
{ 80, 8 },
{ 100, 9 },
- { 110, 10 },
{ 120, 11 },
{ 160, 12 },
{ 200, 13 },
{ 220, 14 },
{ 240, 15 },
- { 250, 16 },
{ 300, 17 },
{ 320, 18 },
{ 440, 19 },