---

yaml --- r: 112363 b: refs/heads/master c: 791ccf2 h: refs/heads/master i: 112361: 0c91b05 112359: dcccf28 v: v3
git-mirror · Sep 29, 2008 · a2e6107 · a2e6107
1 parent e738fa9
commit a2e6107
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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){}