diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-18 23:46:28 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-19 17:26:27 +0000 |
| commit | 5f76559a7736d049705400b5546d524485d5ed0d (patch) | |
| tree | ab26f6ac1e230a2b6ee160bc299e3dba3c4f427f /arch | |
| parent | 57270fcdc7925def3c80d75344467dff2bec8025 (diff) | |
| download | blackbird-op-linux-5f76559a7736d049705400b5546d524485d5ed0d.tar.gz blackbird-op-linux-5f76559a7736d049705400b5546d524485d5ed0d.zip | |
ARM: sa11x0: fix collie build error
f408c985cefc (GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion)
made gpio_to_irq() a function. This breaks collie where it's used to
initialize some static data. Fix that by moving the initialization to
the init code.
arch/arm/mach-sa1100/collie.c:139: error: initializer element is not constant
arch/arm/mach-sa1100/collie.c:139: error: (near initialization for 'collie_power_resource[0].start')
arch/arm/mach-sa1100/collie.c:140: error: initializer element is not constant
arch/arm/mach-sa1100/collie.c:140: error: (near initialization for 'collie_power_resource[0].end')
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index c483912d08af..cce8763d0839 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -144,8 +144,6 @@ static struct pda_power_pdata collie_power_data = { static struct resource collie_power_resource[] = { { .name = "ac", - .start = gpio_to_irq(COLLIE_GPIO_AC_IN), - .end = gpio_to_irq(COLLIE_GPIO_AC_IN), .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE, @@ -347,7 +345,8 @@ static void __init collie_init(void) GPSR |= _COLLIE_GPIO_UCB1x00_RESET; - + collie_power_resource[0].start = gpio_to_irq(COLLIE_GPIO_AC_IN); + collie_power_resource[0].end = gpio_to_irq(COLLIE_GPIO_AC_IN); platform_scoop_config = &collie_pcmcia_config; ret = platform_add_devices(devices, ARRAY_SIZE(devices)); |
