patch-2.4.0-test2 linux/arch/arm/kernel/leds-footbridge.c

• Lines: 40
• Date: Mon Jun 19 17:59:34 2000
• Orig file: v2.4.0-test1/linux/arch/arm/kernel/leds-footbridge.c
• Orig date: Thu Mar 2 14:36:22 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/arm/kernel/leds-footbridge.c linux/arch/arm/kernel/leds-footbridge.c
@@ -46,7 +46,7 @@
 	switch (evt) {
 	case led_start:
 		hw_led_state = XBUS_LED_RED | XBUS_LED_GREEN;
-#ifndef CONFIG_LEDS_IDLE
+#ifndef CONFIG_LEDS_CPU
 		hw_led_state |= XBUS_LED_AMBER;
 #endif
 		led_state |= LED_STATE_ENABLED;
@@ -223,11 +223,12 @@
 {
 }
 
-static void __init
-init_leds_event(led_event_t evt)
-{
-	leds_event = dummy_leds_event;
+void (*leds_event)(led_event_t) = dummy_leds_event;
+
+EXPORT_SYMBOL(leds_event);
 
+static int __init leds_init(void)
+{
 #ifdef CONFIG_FOOTBRIDGE
 	if (machine_is_ebsa285() || machine_is_co285())
 		leds_event = ebsa285_leds_event;
@@ -237,9 +238,9 @@
 		leds_event = netwinder_leds_event;
 #endif
 
-	leds_event(evt);
-}
+	leds_event(led_start);
 
-void (*leds_event)(led_event_t) = init_leds_event;
+	return 0;
+}
 
-EXPORT_SYMBOL(leds_event);
+__initcall(leds_init);