summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-12-08 14:41:29 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-12-08 14:41:29 +0000
commit1265edb8fd2869d17128f1d60683dd6f4191d550 (patch)
tree795e037b9dcaf8fced9777673032f01fe5271667 /sound/soc
parent94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff)
parent03d14a5536cf5611d27a106137a814c8f1135ddd (diff)
downloadlinux-3.10-1265edb8fd2869d17128f1d60683dd6f4191d550.tar.gz
linux-3.10-1265edb8fd2869d17128f1d60683dd6f4191d550.tar.bz2
linux-3.10-1265edb8fd2869d17128f1d60683dd6f4191d550.zip
Merge branch 'pxa-fixes'
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index dd14abcdf1b..60e6f4677f9 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -160,9 +160,9 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97)
gsr_bits = 0;
#ifdef CONFIG_PXA27x
/* PXA27x Developers Manual section 13.5.2.2.1 */
- pxa_set_cken(31, 1);
+ pxa_set_cken(CKEN_AC97CONF, 1);
udelay(5);
- pxa_set_cken(31, 0);
+ pxa_set_cken(CKEN_AC97CONF, 0);
GCR = GCR_COLD_RST;
udelay(50);
#else