Merge branch 'linux-2.6'

[linux-2.6] / arch / arm / mach-pxa / pxa300.c

diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index 5363b1322652a53bad2e16a54ff46759ab7f1ff2..0a0d3877f2125e65fa09db0aba2f401c080291fa 100644 (file)
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2007 Marvell Internation Ltd.
  *
- * 2007-08-21: eric miao <eric.y.miao@gmail.com>
+ * 2007-08-21: eric miao <eric.miao@marvell.com>
  *             initial version
  *
  * This program is free software; you can redistribute it and/or modify
@@ -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),