summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAndrew Victor <linux@maxim.org.za>2008-09-24 22:03:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-29 15:46:26 +0100
commit791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (patch)
tree0c8b11bf00dfa4ed38358dc2faeb85d39869bba9 /arch/arm
parentbf07e4404ebb0911d378172c01748bf822343cde (diff)
downloadop-kernel-dev-791ccf2e4deeea8426b389fd0f5bb0e9167bb75d.zip
op-kernel-dev-791ccf2e4deeea8426b389fd0f5bb0e9167bb75d.tar.gz
[ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c
The name of the platform device 'at91_pwm_leds' conflicts with the function at91_pwm_leds(). So rename the device 'at91_pwm_leds_device' to be more specific. Similarly rename 'at91_gpio_leds_device' for consistency. Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-at91/leds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/leds.c b/arch/arm/mach-at91/leds.c
index ff76d59..0415a839 100644
--- a/arch/arm/mach-at91/leds.c
+++ b/arch/arm/mach-at91/leds.c
@@ -28,7 +28,7 @@
static struct gpio_led_platform_data led_data;
-static struct platform_device at91_leds = {
+static struct platform_device at91_gpio_leds_device = {
.name = "leds-gpio",
.id = -1,
.dev.platform_data = &led_data,
@@ -46,7 +46,7 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr)
led_data.leds = leds;
led_data.num_leds = nr;
- platform_device_register(&at91_leds);
+ platform_device_register(&at91_gpio_leds_device);
}
#else
@@ -64,7 +64,7 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr) {}
static struct gpio_led_platform_data pwm_led_data;
-static struct platform_device at91_pwm_leds = {
+static struct platform_device at91_pwm_leds_device = {
.name = "leds-atmel-pwm",
.id = -1,
.dev.platform_data = &pwm_led_data,
@@ -85,7 +85,7 @@ void __init at91_pwm_leds(struct gpio_led *leds, int nr)
pwm_led_data.num_leds = nr;
at91_add_device_pwm(pwm_mask);
- platform_device_register(&at91_pwm_leds);
+ platform_device_register(&at91_pwm_leds_device);
}
#else
void __init at91_pwm_leds(struct gpio_led *leds, int nr){}
OpenPOWER on IntegriCloud