1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 4fc46772a087..48da39b9bdb0 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -241,28 +241,28 @@ static struct mv_sata_platform_data rd88f5182_sata_data = {
 /*****************************************************************************
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode rd88f5182_mpp_modes[] __initdata = {
+static unsigned int rd88f5182_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Debug Led */
+        MPP0_GPIO,              /* Debug Led */
-        {  1, MPP_GPIO },               /* Reset Switch */
+        MPP1_GPIO,              /* Reset Switch */
-        {  2, MPP_UNUSED },
+        MPP2_UNUSED,
-        {  3, MPP_GPIO },               /* RTC Int */
+        MPP3_GPIO,              /* RTC Int */
-        {  4, MPP_GPIO },
+        MPP4_GPIO,
-        {  5, MPP_GPIO },
+        MPP5_GPIO,
-        {  6, MPP_GPIO },               /* PCI_intA */
+        MPP6_GPIO,              /* PCI_intA */
-        {  7, MPP_GPIO },               /* PCI_intB */
+        MPP7_GPIO,              /* PCI_intB */
-        {  8, MPP_UNUSED },
+        MPP8_UNUSED,
-        {  9, MPP_UNUSED },
+        MPP9_UNUSED,
-        { 10, MPP_UNUSED },
+        MPP10_UNUSED,
-        { 11, MPP_UNUSED },
+        MPP11_UNUSED,
-        { 12, MPP_SATA_LED },           /* SATA 0 presence */
+        MPP12_SATA_LED,         /* SATA 0 presence */
-        { 13, MPP_SATA_LED },           /* SATA 1 presence */
+        MPP13_SATA_LED,         /* SATA 1 presence */
-        { 14, MPP_SATA_LED },           /* SATA 0 active */
+        MPP14_SATA_LED,         /* SATA 0 active */
-        { 15, MPP_SATA_LED },           /* SATA 1 active */
+        MPP15_SATA_LED,         /* SATA 1 active */
-        { 16, MPP_UNUSED },
+        MPP16_UNUSED,
-        { 17, MPP_UNUSED },
+        MPP17_UNUSED,
-        { 18, MPP_UNUSED },
+        MPP18_UNUSED,
-        { 19, MPP_UNUSED },
+        MPP19_UNUSED,
-        { -1 },
+        0,
 };
 static void __init rd88f5182_init(void)

diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 4fc46772a087..48da39b9bdb0 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -241,28 +241,28 @@ static struct mv_sata_platform_data rd88f5182_sata_data = {
241	/*****************************************************************************	241	/*****************************************************************************
242	* General Setup	242	* General Setup
243	****************************************************************************/	243	****************************************************************************/
244	static struct orion5x_mpp_mode rd88f5182_mpp_modes[] __initdata = {	244	static unsigned int rd88f5182_mpp_modes[] __initdata = {
245	{ 0, MPP_GPIO }, /* Debug Led */	245	MPP0_GPIO, /* Debug Led */
246	{ 1, MPP_GPIO }, /* Reset Switch */	246	MPP1_GPIO, /* Reset Switch */
247	{ 2, MPP_UNUSED },	247	MPP2_UNUSED,
248	{ 3, MPP_GPIO }, /* RTC Int */	248	MPP3_GPIO, /* RTC Int */
249	{ 4, MPP_GPIO },	249	MPP4_GPIO,
250	{ 5, MPP_GPIO },	250	MPP5_GPIO,
251	{ 6, MPP_GPIO }, /* PCI_intA */	251	MPP6_GPIO, /* PCI_intA */
252	{ 7, MPP_GPIO }, /* PCI_intB */	252	MPP7_GPIO, /* PCI_intB */
253	{ 8, MPP_UNUSED },	253	MPP8_UNUSED,
254	{ 9, MPP_UNUSED },	254	MPP9_UNUSED,
255	{ 10, MPP_UNUSED },	255	MPP10_UNUSED,
256	{ 11, MPP_UNUSED },	256	MPP11_UNUSED,
257	{ 12, MPP_SATA_LED }, /* SATA 0 presence */	257	MPP12_SATA_LED, /* SATA 0 presence */
258	{ 13, MPP_SATA_LED }, /* SATA 1 presence */	258	MPP13_SATA_LED, /* SATA 1 presence */
259	{ 14, MPP_SATA_LED }, /* SATA 0 active */	259	MPP14_SATA_LED, /* SATA 0 active */
260	{ 15, MPP_SATA_LED }, /* SATA 1 active */	260	MPP15_SATA_LED, /* SATA 1 active */
261	{ 16, MPP_UNUSED },	261	MPP16_UNUSED,
262	{ 17, MPP_UNUSED },	262	MPP17_UNUSED,
263	{ 18, MPP_UNUSED },	263	MPP18_UNUSED,
264	{ 19, MPP_UNUSED },	264	MPP19_UNUSED,
265	{ -1 },	265	0,
266	};	266	};
267		267
268	static void __init rd88f5182_init(void)	268	static void __init rd88f5182_init(void)