aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAndrew Victor <linux@maxim.org.za>2008-09-24 17:03:52 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-29 10:46:26 -0400
commit791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (patch)
tree0c8b11bf00dfa4ed38358dc2faeb85d39869bba9 /arch/arm
parentbf07e4404ebb0911d378172c01748bf822343cde (diff)
[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 ff76d59392cc..0415a839e1ad 100644
--- a/arch/arm/mach-at91/leds.c
+++ b/arch/arm/mach-at91/leds.c
@@ -28,7 +28,7 @@
28 28
29static struct gpio_led_platform_data led_data; 29static struct gpio_led_platform_data led_data;
30 30
31static struct platform_device at91_leds = { 31static struct platform_device at91_gpio_leds_device = {
32 .name = "leds-gpio", 32 .name = "leds-gpio",
33 .id = -1, 33 .id = -1,
34 .dev.platform_data = &led_data, 34 .dev.platform_data = &led_data,
@@ -46,7 +46,7 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr)
46 46
47 led_data.leds = leds; 47 led_data.leds = leds;
48 led_data.num_leds = nr; 48 led_data.num_leds = nr;
49 platform_device_register(&at91_leds); 49 platform_device_register(&at91_gpio_leds_device);
50} 50}
51 51
52#else 52#else
@@ -64,7 +64,7 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr) {}
64 64
65static struct gpio_led_platform_data pwm_led_data; 65static struct gpio_led_platform_data pwm_led_data;
66 66
67static struct platform_device at91_pwm_leds = { 67static struct platform_device at91_pwm_leds_device = {
68 .name = "leds-atmel-pwm", 68 .name = "leds-atmel-pwm",
69 .id = -1, 69 .id = -1,
70 .dev.platform_data = &pwm_led_data, 70 .dev.platform_data = &pwm_led_data,
@@ -85,7 +85,7 @@ void __init at91_pwm_leds(struct gpio_led *leds, int nr)
85 pwm_led_data.num_leds = nr; 85 pwm_led_data.num_leds = nr;
86 86
87 at91_add_device_pwm(pwm_mask); 87 at91_add_device_pwm(pwm_mask);
88 platform_device_register(&at91_pwm_leds); 88 platform_device_register(&at91_pwm_leds_device);
89} 89}
90#else 90#else
91void __init at91_pwm_leds(struct gpio_led *leds, int nr){} 91void __init at91_pwm_leds(struct gpio_led *leds, int nr){}