diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 13:22:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 13:22:16 +0100 |
| commit | 87fee06c5b3a04289115aa5c77a9dd59f81d0817 (patch) | |
| tree | 41557cced54a5232207cdf215e2d969e12e41556 /arch/arm/mach-pxa/pxa27x.c | |
| parent | Merge remote-tracking branch 'asoc/fix/lm49453' into tmp (diff) | |
| parent | ALSA: pxa27x: fix ac97 warm reset (diff) | |
| download | linux-87fee06c5b3a04289115aa5c77a9dd59f81d0817.tar.xz linux-87fee06c5b3a04289115aa5c77a9dd59f81d0817.zip | |
Merge remote-tracking branch 'asoc/fix/pxa' into tmp
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 8047ee0effc5..616cb87b6179 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -47,9 +47,9 @@ void pxa27x_clear_otgph(void) EXPORT_SYMBOL(pxa27x_clear_otgph); static unsigned long ac97_reset_config[] = { - GPIO113_GPIO, + GPIO113_AC97_nRESET_GPIO_HIGH, GPIO113_AC97_nRESET, - GPIO95_GPIO, + GPIO95_AC97_nRESET_GPIO_HIGH, GPIO95_AC97_nRESET, }; |