Commit 18473473 authored by Eric Miao's avatar Eric Miao

[ARM] pxa: fix the conflicting non-static declarations of global_gpios[]

Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent 361778d6
...@@ -802,7 +802,7 @@ static struct platform_device *devices[] __initdata = { ...@@ -802,7 +802,7 @@ static struct platform_device *devices[] __initdata = {
&pcmcia, &pcmcia,
}; };
struct gpio_ress global_gpios[] = { static struct gpio_ress global_gpios[] = {
HX4700_GPIO_IN(GPIO12_HX4700_ASIC3_IRQ, "ASIC3_IRQ"), HX4700_GPIO_IN(GPIO12_HX4700_ASIC3_IRQ, "ASIC3_IRQ"),
HX4700_GPIO_IN(GPIO13_HX4700_W3220_IRQ, "W3220_IRQ"), HX4700_GPIO_IN(GPIO13_HX4700_W3220_IRQ, "W3220_IRQ"),
HX4700_GPIO_IN(GPIO14_HX4700_nWLAN_IRQ, "WLAN_IRQ"), HX4700_GPIO_IN(GPIO14_HX4700_nWLAN_IRQ, "WLAN_IRQ"),
......
...@@ -798,7 +798,7 @@ static void mioa701_restart(char c, const char *cmd) ...@@ -798,7 +798,7 @@ static void mioa701_restart(char c, const char *cmd)
arm_machine_restart('s', cmd); arm_machine_restart('s', cmd);
} }
struct gpio_ress global_gpios[] = { static struct gpio_ress global_gpios[] = {
MIO_GPIO_OUT(GPIO9_CHARGE_EN, 1, "Charger enable"), MIO_GPIO_OUT(GPIO9_CHARGE_EN, 1, "Charger enable"),
MIO_GPIO_OUT(GPIO18_POWEROFF, 0, "Power Off"), MIO_GPIO_OUT(GPIO18_POWEROFF, 0, "Power Off"),
MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power") MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment