diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2009-06-07 11:05:45 -0400 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-11 10:12:13 -0400 |
| commit | 18473473880622b671a73dfdcaf03e9b526e0fb2 (patch) | |
| tree | 2ec5c88c363adaf30ff1b8aba63f08a370c5a337 /arch/arm/mach-pxa/hx4700.c | |
| parent | 361778d6e7cb315b50f3f2469d782e90df7ac2cb (diff) | |
[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/mach-pxa/hx4700.c')
| -rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 |
1 files changed, 1 insertions, 1 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 = { | |||
| 802 | &pcmcia, | 802 | &pcmcia, |
| 803 | }; | 803 | }; |
| 804 | 804 | ||
| 805 | struct gpio_ress global_gpios[] = { | 805 | static struct gpio_ress global_gpios[] = { |
| 806 | HX4700_GPIO_IN(GPIO12_HX4700_ASIC3_IRQ, "ASIC3_IRQ"), | 806 | HX4700_GPIO_IN(GPIO12_HX4700_ASIC3_IRQ, "ASIC3_IRQ"), |
| 807 | HX4700_GPIO_IN(GPIO13_HX4700_W3220_IRQ, "W3220_IRQ"), | 807 | HX4700_GPIO_IN(GPIO13_HX4700_W3220_IRQ, "W3220_IRQ"), |
| 808 | HX4700_GPIO_IN(GPIO14_HX4700_nWLAN_IRQ, "WLAN_IRQ"), | 808 | HX4700_GPIO_IN(GPIO14_HX4700_nWLAN_IRQ, "WLAN_IRQ"), |