git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
m68k
/
hp300
/
time.c
diff --git
a/arch/m68k/hp300/time.c
b/arch/m68k/hp300/time.c
index
8da5b1b
..
7df0566
100644
(file)
--- a/
arch/m68k/hp300/time.c
+++ b/
arch/m68k/hp300/time.c
@@
-18,7
+18,6
@@
#include <asm/system.h>
#include <asm/traps.h>
#include <asm/blinken.h>
#include <asm/system.h>
#include <asm/traps.h>
#include <asm/blinken.h>
-#include "ints.h"
/* Clock hardware definitions */
/* Clock hardware definitions */
@@
-71,7
+70,7
@@
void __init hp300_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *
asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
-
cpu_request_irq(
6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
+
request_irq(IRQ_AUTO_
6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */