diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/sparc/kernel/time.c | |
parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/sparc/kernel/time.c')
-rw-r--r-- | arch/sparc/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index f1401b57ccc7..7b4612da74a6 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -148,7 +148,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
148 | } | 148 | } |
149 | 149 | ||
150 | /* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */ | 150 | /* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */ |
151 | static void __init kick_start_clock(void) | 151 | static void __devinit kick_start_clock(void) |
152 | { | 152 | { |
153 | struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs; | 153 | struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs; |
154 | unsigned char sec; | 154 | unsigned char sec; |
@@ -223,7 +223,7 @@ static __inline__ int has_low_battery(void) | |||
223 | return (data1 == data2); /* Was the write blocked? */ | 223 | return (data1 == data2); /* Was the write blocked? */ |
224 | } | 224 | } |
225 | 225 | ||
226 | static void __init mostek_set_system_time(void) | 226 | static void __devinit mostek_set_system_time(void) |
227 | { | 227 | { |
228 | unsigned int year, mon, day, hour, min, sec; | 228 | unsigned int year, mon, day, hour, min, sec; |
229 | struct mostek48t02 *mregs; | 229 | struct mostek48t02 *mregs; |