1 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
index 9eac8192d923..5aacc7ac5cf4 100644
--- a/arch/arm/mach-orion5x/ts409-setup.c
+++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -242,28 +242,28 @@ static struct platform_device qnap_ts409_button_device = {
 /*****************************************************************************
 * General Setup
 ****************************************************************************/
-static struct orion5x_mpp_mode ts409_mpp_modes[] __initdata = {
+static unsigned int ts409_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
+        MPP0_UNUSED,
-        {  1, MPP_UNUSED },
+        MPP1_UNUSED,
-        {  2, MPP_UNUSED },
+        MPP2_UNUSED,
-        {  3, MPP_UNUSED },
+        MPP3_UNUSED,
-        {  4, MPP_GPIO },               /* HDD 1 status */
+        MPP4_GPIO,              /* HDD 1 status */
-        {  5, MPP_GPIO },               /* HDD 2 status */
+        MPP5_GPIO,              /* HDD 2 status */
-        {  6, MPP_GPIO },               /* HDD 3 status */
+        MPP6_GPIO,              /* HDD 3 status */
-        {  7, MPP_GPIO },               /* HDD 4 status */
+        MPP7_GPIO,              /* HDD 4 status */
-        {  8, MPP_UNUSED },
+        MPP8_UNUSED,
-        {  9, MPP_UNUSED },
+        MPP9_UNUSED,
-        { 10, MPP_GPIO },               /* RTC int */
+        MPP10_GPIO,             /* RTC int */
-        { 11, MPP_UNUSED },
+        MPP11_UNUSED,
-        { 12, MPP_UNUSED },
+        MPP12_UNUSED,
-        { 13, MPP_UNUSED },
+        MPP13_UNUSED,
-        { 14, MPP_GPIO },               /* SW_RST */
+        MPP14_GPIO,             /* SW_RST */
-        { 15, MPP_GPIO },               /* USB copy button */
+        MPP15_GPIO,             /* USB copy button */
-        { 16, MPP_UART },               /* UART1 RXD */
+        MPP16_UART,             /* UART1 RXD */
-        { 17, MPP_UART },               /* UART1 TXD */
+        MPP17_UART,             /* UART1 TXD */
-        { 18, MPP_UNUSED },
+        MPP18_UNUSED,
-        { 19, MPP_UNUSED },
+        MPP19_UNUSED,
-        { -1 },
+        0,
 };
 static void __init qnap_ts409_init(void)

diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index 9eac8192d923..5aacc7ac5cf4 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -242,28 +242,28 @@ static struct platform_device qnap_ts409_button_device = {
242	/*****************************************************************************	242	/*****************************************************************************
243	* General Setup	243	* General Setup
244	****************************************************************************/	244	****************************************************************************/
245	static struct orion5x_mpp_mode ts409_mpp_modes[] __initdata = {	245	static unsigned int ts409_mpp_modes[] __initdata = {
246	{ 0, MPP_UNUSED },	246	MPP0_UNUSED,
247	{ 1, MPP_UNUSED },	247	MPP1_UNUSED,
248	{ 2, MPP_UNUSED },	248	MPP2_UNUSED,
249	{ 3, MPP_UNUSED },	249	MPP3_UNUSED,
250	{ 4, MPP_GPIO }, /* HDD 1 status */	250	MPP4_GPIO, /* HDD 1 status */
251	{ 5, MPP_GPIO }, /* HDD 2 status */	251	MPP5_GPIO, /* HDD 2 status */
252	{ 6, MPP_GPIO }, /* HDD 3 status */	252	MPP6_GPIO, /* HDD 3 status */
253	{ 7, MPP_GPIO }, /* HDD 4 status */	253	MPP7_GPIO, /* HDD 4 status */
254	{ 8, MPP_UNUSED },	254	MPP8_UNUSED,
255	{ 9, MPP_UNUSED },	255	MPP9_UNUSED,
256	{ 10, MPP_GPIO }, /* RTC int */	256	MPP10_GPIO, /* RTC int */
257	{ 11, MPP_UNUSED },	257	MPP11_UNUSED,
258	{ 12, MPP_UNUSED },	258	MPP12_UNUSED,
259	{ 13, MPP_UNUSED },	259	MPP13_UNUSED,
260	{ 14, MPP_GPIO }, /* SW_RST */	260	MPP14_GPIO, /* SW_RST */
261	{ 15, MPP_GPIO }, /* USB copy button */	261	MPP15_GPIO, /* USB copy button */
262	{ 16, MPP_UART }, /* UART1 RXD */	262	MPP16_UART, /* UART1 RXD */
263	{ 17, MPP_UART }, /* UART1 TXD */	263	MPP17_UART, /* UART1 TXD */
264	{ 18, MPP_UNUSED },	264	MPP18_UNUSED,
265	{ 19, MPP_UNUSED },	265	MPP19_UNUSED,
266	{ -1 },	266	0,
267	};	267	};
268		268
269	static void __init qnap_ts409_init(void)	269	static void __init qnap_ts409_init(void)