diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-08 11:29:45 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-08 11:29:45 +0000 |
commit | 07afa01813d547570a762034f0dce7fd8baa8b3d (patch) | |
tree | 5b0a34f64e0f0e824ea153adeb6c98b98dd852ac /arch/arm/mach-pxa/pxa27x.c | |
parent | 01a61f490cab732542753db69e17e5db657d185a (diff) | |
parent | 3b4bc7bccc7857274705b05cf81a0c72cfd0b0dd (diff) | |
download | linux-07afa01813d547570a762034f0dce7fd8baa8b3d.tar.gz linux-07afa01813d547570a762034f0dce7fd8baa8b3d.tar.bz2 linux-07afa01813d547570a762034f0dce7fd8baa8b3d.zip |
Merge remote-tracking branch 'asoc/fix/pxa' into asoc-pxa
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, }; |