Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[pandora-kernel.git] / arch / arm / mach-orion5x / terastation_pro2-setup.c

diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index 6160041..29ce826 100644 (file)
--- a/arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -295,28 +295,28 @@ static void tsp2_power_off(void)
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode tsp2_mpp_modes[] __initdata = {
-       {  0, MPP_PCIE_RST_OUTn },
-       {  1, MPP_UNUSED },
-       {  2, MPP_UNUSED },
-       {  3, MPP_UNUSED },
-       {  4, MPP_NAND },               /* BOOT NAND Flash REn */
-       {  5, MPP_NAND },               /* BOOT NAND Flash WEn */
-       {  6, MPP_NAND },               /* BOOT NAND Flash HREn[0] */
-       {  7, MPP_NAND },               /* BOOT NAND Flash WEn[0] */
-       {  8, MPP_GPIO },               /* MICON int */
-       {  9, MPP_GPIO },               /* RTC int */
-       { 10, MPP_UNUSED },
-       { 11, MPP_GPIO },               /* PCI Int A */
-       { 12, MPP_UNUSED },
-       { 13, MPP_GPIO },               /* UPS on UART0 enable */
-       { 14, MPP_GPIO },               /* UPS low battery detection */
-       { 15, MPP_UNUSED },
-       { 16, MPP_UART },               /* UART1 RXD */
-       { 17, MPP_UART },               /* UART1 TXD */
-       { 18, MPP_UART },               /* UART1 CTSn */
-       { 19, MPP_UART },               /* UART1 RTSn */
-       { -1 },
+static unsigned int tsp2_mpp_modes[] __initdata = {
+       MPP0_PCIE_RST_OUTn,
+       MPP1_UNUSED,
+       MPP2_UNUSED,
+       MPP3_UNUSED,
+       MPP4_NAND,              /* BOOT NAND Flash REn */
+       MPP5_NAND,              /* BOOT NAND Flash WEn */
+       MPP6_NAND,              /* BOOT NAND Flash HREn[0] */
+       MPP7_NAND,              /* BOOT NAND Flash WEn[0] */
+       MPP8_GPIO,              /* MICON int */
+       MPP9_GPIO,              /* RTC int */
+       MPP10_UNUSED,
+       MPP11_GPIO,             /* PCI Int A */
+       MPP12_UNUSED,
+       MPP13_GPIO,             /* UPS on UART0 enable */
+       MPP14_GPIO,             /* UPS low battery detection */
+       MPP15_UNUSED,
+       MPP16_UART,             /* UART1 RXD */
+       MPP17_UART,             /* UART1 TXD */
+       MPP18_UART,             /* UART1 CTSn */
+       MPP19_UART,             /* UART1 RTSn */
+       0,
 };
 
 static void __init tsp2_init(void)