diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /arch/arm/mach-pxa/pxa27x.c | |
parent | ARM: fix build warning in asm/elf.h (diff) | |
parent | Merge branch 'test' of ../test/linux-2.6-lpc2 into wells/lpc32xx-arch_v2 (diff) | |
download | linux-dev-129961ecaf21c9ee899ad9067d917c1aa172fb7a.tar.xz linux-dev-129961ecaf21c9ee899ad9067d917c1aa172fb7a.zip |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 0af36177ff08..c059dac02b61 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -41,10 +41,10 @@ void pxa27x_clear_otgph(void) EXPORT_SYMBOL(pxa27x_clear_otgph); static unsigned long ac97_reset_config[] = { - GPIO95_AC97_nRESET, - GPIO95_GPIO, - GPIO113_AC97_nRESET, GPIO113_GPIO, + GPIO113_AC97_nRESET, + GPIO95_GPIO, + GPIO95_AC97_nRESET, }; void pxa27x_assert_ac97reset(int reset_gpio, int on) |