Merge branch 'integration' into for-linus

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

diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c
index 7adafd7..8503d0a 100644 (file)
--- a/arch/arm/mach-orion5x/ls_hgl-setup.c
+++ b/arch/arm/mach-orion5x/ls_hgl-setup.c
@@ -200,28 +200,28 @@ static void ls_hgl_power_off(void)
 
 #define LS_HGL_GPIO_HDD_POWER  1
 
-static struct orion5x_mpp_mode ls_hgl_mpp_modes[] __initdata = {
-       {  0, MPP_GPIO }, /* LED_PWR */
-       {  1, MPP_GPIO }, /* HDD_PWR */
-       {  2, MPP_GPIO }, /* LED_ALARM */
-       {  3, MPP_GPIO }, /* LED_INFO */
-       {  4, MPP_UNUSED },
-       {  5, MPP_UNUSED },
-       {  6, MPP_GPIO }, /* FAN_LCK */
-       {  7, MPP_GPIO }, /* INIT */
-       {  8, MPP_GPIO }, /* POWER */
-       {  9, MPP_GPIO }, /* USB_PWR */
-       { 10, MPP_GPIO }, /* AUTO_POWER */
-       { 11, MPP_UNUSED }, /* LED_ETH (dummy) */
-       { 12, MPP_UNUSED },
-       { 13, MPP_UNUSED },
-       { 14, MPP_UNUSED },
-       { 15, MPP_GPIO }, /* FUNC */
-       { 16, MPP_UNUSED },
-       { 17, MPP_GPIO }, /* LED_FUNC */
-       { 18, MPP_UNUSED },
-       { 19, MPP_UNUSED },
-       { -1 },
+static unsigned int ls_hgl_mpp_modes[] __initdata = {
+       MPP0_GPIO, /* LED_PWR */
+       MPP1_GPIO, /* HDD_PWR */
+       MPP2_GPIO, /* LED_ALARM */
+       MPP3_GPIO, /* LED_INFO */
+       MPP4_UNUSED,
+       MPP5_UNUSED,
+       MPP6_GPIO, /* FAN_LCK */
+       MPP7_GPIO, /* INIT */
+       MPP8_GPIO, /* POWER */
+       MPP9_GPIO, /* USB_PWR */
+       MPP10_GPIO, /* AUTO_POWER */
+       MPP11_UNUSED, /* LED_ETH (dummy) */
+       MPP12_UNUSED,
+       MPP13_UNUSED,
+       MPP14_UNUSED,
+       MPP15_GPIO, /* FUNC */
+       MPP16_UNUSED,
+       MPP17_GPIO, /* LED_FUNC */
+       MPP18_UNUSED,
+       MPP19_UNUSED,
+       0,
 };
 
 static void __init ls_hgl_init(void)