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

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 0f6568005e16e1485cc6049a43dbcad434261a28..7fff467e84fc0482eed3c638b72574dc3c16a07c 100644 (file)
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -802,7 +802,7 @@ static struct platform_device *devices[] __initdata = {
        &pcmcia,
 };
 
-struct gpio_ress global_gpios[] = {
+static struct gpio_ress global_gpios[] = {
        HX4700_GPIO_IN(GPIO12_HX4700_ASIC3_IRQ, "ASIC3_IRQ"),
        HX4700_GPIO_IN(GPIO13_HX4700_W3220_IRQ, "W3220_IRQ"),
        HX4700_GPIO_IN(GPIO14_HX4700_nWLAN_IRQ, "WLAN_IRQ"),

diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 804c25c4a064a070ee61c214ee3a7dd8432e8d31..4dc8c2ec40a912cffbab11e676f5f53bd046049d 100644 (file)
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -798,7 +798,7 @@ static void mioa701_restart(char c, const char *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(GPIO18_POWEROFF, 0, "Power Off"),
        MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power")