summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAleksey Makarov <amakarov@ru.mvista.com>2007-10-18 08:38:14 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-10-21 00:42:04 +0200
commit0825c672599bedbb423ef26f3cdd0c5a014da149 (patch)
treeb87cba59ec39f5ce24cac7383747eff483bd1b01 /arch/arm
parentRevert "kconfig: tristate choices with mixed tristate and boolean values" (diff)
downloadlinux-0825c672599bedbb423ef26f3cdd0c5a014da149.tar.xz
linux-0825c672599bedbb423ef26f3cdd0c5a014da149.zip
[ARM] 4613/1: pxa300: MFP typo fix
This fixes a typo in MFP address map. Signed-off-by: Aleksey Makarov <amakarov@ru.mvista.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/pxa300.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index 5363b1322652..7a34231f3172 100644
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -23,8 +23,10 @@ static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = {
MFP_ADDR_X(GPIO0, GPIO2, 0x00b4),
MFP_ADDR_X(GPIO3, GPIO26, 0x027c),
- MFP_ADDR_X(GPIO27, GPIO127, 0x0400),
- MFP_ADDR_X(GPIO0_2, GPIO6_2, 0x02ec),
+ MFP_ADDR_X(GPIO27, GPIO98, 0x0400),
+ MFP_ADDR_X(GPIO99, GPIO127, 0x0600),
+ MFP_ADDR_X(GPIO0_2, GPIO1_2, 0x0674),
+ MFP_ADDR_X(GPIO2_2, GPIO6_2, 0x02dc),
MFP_ADDR(nBE0, 0x0204),
MFP_ADDR(nBE1, 0x0208),