From b22cfa8ee1de928cfbd390c3ca52ce206c2f7178 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Sat, 19 May 2007 12:03:24 -0700 Subject: [PATCH] --- yaml --- r: 57066 b: refs/heads/master c: 42e28264783f1b3b9a99e0fdda263ed9bffcf331 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/time.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 26734cec7ff0..0bf2dad5b621 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59db8102bd0ab7a67d525d086ca08e07d69fadd4 +refs/heads/master: 42e28264783f1b3b9a99e0fdda263ed9bffcf331 diff --git a/trunk/arch/sparc/kernel/time.c b/trunk/arch/sparc/kernel/time.c index f1401b57ccc7..7b4612da74a6 100644 --- a/trunk/arch/sparc/kernel/time.c +++ b/trunk/arch/sparc/kernel/time.c @@ -148,7 +148,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) } /* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */ -static void __init kick_start_clock(void) +static void __devinit kick_start_clock(void) { struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs; unsigned char sec; @@ -223,7 +223,7 @@ static __inline__ int has_low_battery(void) return (data1 == data2); /* Was the write blocked? */ } -static void __init mostek_set_system_time(void) +static void __devinit mostek_set_system_time(void) { unsigned int year, mon, day, hour, min, sec; struct mostek48t02 *mregs;