>From 36cfe416d7b099097ed3f37bb62134c674fc68ce Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 10 Aug 2010 13:02:30 +0200 Subject: [PATCH] arch/frv: Rename dead HEARTBEAT config option Because CONFIG_HEARTBEAT isn't defined for the frv arch, this block would be dead. As suggested by Felipe Balbi CONFIG_HEARTBEAT was replaced by CONFIG_LEDS_TRIGGER_HEARTBEAT. --- arch/frv/kernel/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c index 0ddbbae..d8fff7e 100644 --- a/arch/frv/kernel/time.c +++ b/arch/frv/kernel/time.c @@ -66,11 +66,11 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) do_timer(1); -#ifdef CONFIG_HEARTBEAT +#ifdef CONFIG_LEDS_TRIGGER_HEARTBEAT static unsigned short n; n++; __set_LEDS(n); -#endif /* CONFIG_HEARTBEAT */ +#endif /* CONFIG_LEDS_TRIGGER_HEARTBEAT */ write_sequnlock(&xtime_lock); -- 1.7.0.4