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

diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c index 61600414391..29ce826c3c2 100644 --- 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)
295	/*****************************************************************************	295	/*****************************************************************************
296	* General Setup	296	* General Setup
297	****************************************************************************/	297	****************************************************************************/
298	static struct orion5x_mpp_mode tsp2_mpp_modes[] __initdata = {	298	static unsigned int tsp2_mpp_modes[] __initdata = {
299	{ 0, MPP_PCIE_RST_OUTn },	299	MPP0_PCIE_RST_OUTn,
300	{ 1, MPP_UNUSED },	300	MPP1_UNUSED,
301	{ 2, MPP_UNUSED },	301	MPP2_UNUSED,
302	{ 3, MPP_UNUSED },	302	MPP3_UNUSED,
303	{ 4, MPP_NAND }, /* BOOT NAND Flash REn */	303	MPP4_NAND, /* BOOT NAND Flash REn */
304	{ 5, MPP_NAND }, /* BOOT NAND Flash WEn */	304	MPP5_NAND, /* BOOT NAND Flash WEn */
305	{ 6, MPP_NAND }, /* BOOT NAND Flash HREn[0] */	305	MPP6_NAND, /* BOOT NAND Flash HREn[0] */
306	{ 7, MPP_NAND }, /* BOOT NAND Flash WEn[0] */	306	MPP7_NAND, /* BOOT NAND Flash WEn[0] */
307	{ 8, MPP_GPIO }, /* MICON int */	307	MPP8_GPIO, /* MICON int */
308	{ 9, MPP_GPIO }, /* RTC int */	308	MPP9_GPIO, /* RTC int */
309	{ 10, MPP_UNUSED },	309	MPP10_UNUSED,
310	{ 11, MPP_GPIO }, /* PCI Int A */	310	MPP11_GPIO, /* PCI Int A */
311	{ 12, MPP_UNUSED },	311	MPP12_UNUSED,
312	{ 13, MPP_GPIO }, /* UPS on UART0 enable */	312	MPP13_GPIO, /* UPS on UART0 enable */
313	{ 14, MPP_GPIO }, /* UPS low battery detection */	313	MPP14_GPIO, /* UPS low battery detection */
314	{ 15, MPP_UNUSED },	314	MPP15_UNUSED,
315	{ 16, MPP_UART }, /* UART1 RXD */	315	MPP16_UART, /* UART1 RXD */
316	{ 17, MPP_UART }, /* UART1 TXD */	316	MPP17_UART, /* UART1 TXD */
317	{ 18, MPP_UART }, /* UART1 CTSn */	317	MPP18_UART, /* UART1 CTSn */
318	{ 19, MPP_UART }, /* UART1 RTSn */	318	MPP19_UART, /* UART1 RTSn */
319	{ -1 },	319	0,
320	};	320	};
321		321
322	static void __init tsp2_init(void)	322	static void __init tsp2_init(void)