diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-28 19:29:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-28 19:29:37 -0700 |
| commit | 715dad5992b1466320c1ac674db46297e57acf21 (patch) | |
| tree | 97855d63805137ff958f5a2c75f0bf47eb5f3ace /sound | |
| parent | 1e4dcd22efa7d24f637ab2ea3a77dd65774eb005 (diff) | |
| parent | 0a9c2df263b2ef487e6b4015644cc18012d7411b (diff) | |
| download | kernel-crypto-715dad5992b1466320c1ac674db46297e57acf21.tar.gz kernel-crypto-715dad5992b1466320c1ac674db46297e57acf21.tar.xz kernel-crypto-715dad5992b1466320c1ac674db46297e57acf21.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4527/1: pxa: fix pxa27x ac97 cold reset in ASoC due to CKEN change
[ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx
[ARM] 4529/1: [HP Jornada 7XX] - Fix jornada720.c to use SSP driver
[ARM] 4528/1: [HP Jornada 7XX] - Fix typo in jornada720_ssp.c
[ARM] Remove CONFIG_IGNORE_FIQ
[ARM] 4526/1: pxa: make ARCH_PXA select GENERIC_CLOCKEVENTS
[ARM] setup_profiling_timer must not be __init
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 129d851b315..dd14abcdf1b 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(1 << 31, 1); + pxa_set_cken(31, 1); udelay(5); - pxa_set_cken(1 << 31, 0); + pxa_set_cken(31, 0); GCR = GCR_COLD_RST; udelay(50); #else |