1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index 4e5216be0745..444a1c7fdfd6 100644
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -24,28 +24,28 @@
 #include "common.h"
 #include "mpp.h"
-static struct orion5x_mpp_mode wnr854t_mpp_modes[] __initdata = {
+static unsigned int wnr854t_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Power LED green (0=on) */
+        MPP0_GPIO,              /* Power LED green (0=on) */
-        {  1, MPP_GPIO },               /* Reset Button (0=off) */
+        MPP1_GPIO,              /* Reset Button (0=off) */
-        {  2, MPP_GPIO },               /* Power LED blink (0=off) */
+        MPP2_GPIO,              /* Power LED blink (0=off) */
-        {  3, MPP_GPIO },               /* WAN Status LED amber (0=off) */
+        MPP3_GPIO,              /* WAN Status LED amber (0=off) */
-        {  4, MPP_GPIO },               /* PCI int */
+        MPP4_GPIO,              /* PCI int */
-        {  5, MPP_GPIO },               /* ??? */
+        MPP5_GPIO,              /* ??? */
-        {  6, MPP_GPIO },               /* ??? */
+        MPP6_GPIO,              /* ??? */
-        {  7, MPP_GPIO },               /* ??? */
+        MPP7_GPIO,              /* ??? */
-        {  8, MPP_UNUSED },             /* ??? */
+        MPP8_UNUSED,            /* ??? */
-        {  9, MPP_GIGE },               /* GE_RXERR */
+        MPP9_GIGE,              /* GE_RXERR */
-        { 10, MPP_UNUSED },             /* ??? */
+        MPP10_UNUSED,           /* ??? */
-        { 11, MPP_UNUSED },             /* ??? */
+        MPP11_UNUSED,           /* ??? */
-        { 12, MPP_GIGE },               /* GE_TXD[4] */
+        MPP12_GIGE,             /* GE_TXD[4] */
-        { 13, MPP_GIGE },               /* GE_TXD[5] */
+        MPP13_GIGE,             /* GE_TXD[5] */
-        { 14, MPP_GIGE },               /* GE_TXD[6] */
+        MPP14_GIGE,             /* GE_TXD[6] */
-        { 15, MPP_GIGE },               /* GE_TXD[7] */
+        MPP15_GIGE,             /* GE_TXD[7] */
-        { 16, MPP_GIGE },               /* GE_RXD[4] */
+        MPP16_GIGE,             /* GE_RXD[4] */
-        { 17, MPP_GIGE },               /* GE_RXD[5] */
+        MPP17_GIGE,             /* GE_RXD[5] */
-        { 18, MPP_GIGE },               /* GE_RXD[6] */
+        MPP18_GIGE,             /* GE_RXD[6] */
-        { 19, MPP_GIGE },               /* GE_RXD[7] */
+        MPP19_GIGE,             /* GE_RXD[7] */
-        { -1 },
+        0,
 };
 /*

diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c index 4e5216be0745..444a1c7fdfd6 100644 --- a/arch/arm/mach-orion5x/wnr854t-setup.c +++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -24,28 +24,28 @@
24	#include "common.h"	24	#include "common.h"
25	#include "mpp.h"	25	#include "mpp.h"
26		26
27	static struct orion5x_mpp_mode wnr854t_mpp_modes[] __initdata = {	27	static unsigned int wnr854t_mpp_modes[] __initdata = {
28	{ 0, MPP_GPIO }, /* Power LED green (0=on) */	28	MPP0_GPIO, /* Power LED green (0=on) */
29	{ 1, MPP_GPIO }, /* Reset Button (0=off) */	29	MPP1_GPIO, /* Reset Button (0=off) */
30	{ 2, MPP_GPIO }, /* Power LED blink (0=off) */	30	MPP2_GPIO, /* Power LED blink (0=off) */
31	{ 3, MPP_GPIO }, /* WAN Status LED amber (0=off) */	31	MPP3_GPIO, /* WAN Status LED amber (0=off) */
32	{ 4, MPP_GPIO }, /* PCI int */	32	MPP4_GPIO, /* PCI int */
33	{ 5, MPP_GPIO }, /* ??? */	33	MPP5_GPIO, /* ??? */
34	{ 6, MPP_GPIO }, /* ??? */	34	MPP6_GPIO, /* ??? */
35	{ 7, MPP_GPIO }, /* ??? */	35	MPP7_GPIO, /* ??? */
36	{ 8, MPP_UNUSED }, /* ??? */	36	MPP8_UNUSED, /* ??? */
37	{ 9, MPP_GIGE }, /* GE_RXERR */	37	MPP9_GIGE, /* GE_RXERR */
38	{ 10, MPP_UNUSED }, /* ??? */	38	MPP10_UNUSED, /* ??? */
39	{ 11, MPP_UNUSED }, /* ??? */	39	MPP11_UNUSED, /* ??? */
40	{ 12, MPP_GIGE }, /* GE_TXD[4] */	40	MPP12_GIGE, /* GE_TXD[4] */
41	{ 13, MPP_GIGE }, /* GE_TXD[5] */	41	MPP13_GIGE, /* GE_TXD[5] */
42	{ 14, MPP_GIGE }, /* GE_TXD[6] */	42	MPP14_GIGE, /* GE_TXD[6] */
43	{ 15, MPP_GIGE }, /* GE_TXD[7] */	43	MPP15_GIGE, /* GE_TXD[7] */
44	{ 16, MPP_GIGE }, /* GE_RXD[4] */	44	MPP16_GIGE, /* GE_RXD[4] */
45	{ 17, MPP_GIGE }, /* GE_RXD[5] */	45	MPP17_GIGE, /* GE_RXD[5] */
46	{ 18, MPP_GIGE }, /* GE_RXD[6] */	46	MPP18_GIGE, /* GE_RXD[6] */
47	{ 19, MPP_GIGE }, /* GE_RXD[7] */	47	MPP19_GIGE, /* GE_RXD[7] */
48	{ -1 },	48	0,
49	};	49	};
50		50
51	/*	51	/*