diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2009-06-07 19:05:45 +0400 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-11 18:12:13 +0400 |
| commit | 18473473880622b671a73dfdcaf03e9b526e0fb2 (patch) | |
| tree | 2ec5c88c363adaf30ff1b8aba63f08a370c5a337 /arch/arm | |
| parent | 361778d6e7cb315b50f3f2469d782e90df7ac2cb (diff) | |
| download | linux-18473473880622b671a73dfdcaf03e9b526e0fb2.tar.xz | |
[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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 0f6568005e16..7fff467e84fc 100644 --- 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 804c25c4a064..4dc8c2ec40a9 100644 --- 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") |