From a2e6107f7e644da2d98d10ea5a626351b17ad5f7 Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Wed, 24 Sep 2008 22:03:52 +0100 Subject: [PATCH] --- yaml --- r: 112363 b: refs/heads/master c: 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d h: refs/heads/master i: 112361: 0c91b055ce5d0b5494725bbcfeaece854fef22ca 112359: dcccf28467ece5cd991543f3c417e120d083f195 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/leds.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a38ca192d10..59a2bebe94b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf07e4404ebb0911d378172c01748bf822343cde +refs/heads/master: 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d diff --git a/trunk/arch/arm/mach-at91/leds.c b/trunk/arch/arm/mach-at91/leds.c index ff76d59392cc..0415a839e1ad 100644 --- a/trunk/arch/arm/mach-at91/leds.c +++ b/trunk/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){}