git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
[pandora-kernel.git]
/
arch
/
m68k
/
hp300
/
time.c
diff --git
a/arch/m68k/hp300/time.c
b/arch/m68k/hp300/time.c
index
f6312c7
..
c87fe69
100644
(file)
--- a/
arch/m68k/hp300/time.c
+++ b/
arch/m68k/hp300/time.c
@@
-70,7
+70,7
@@
void __init hp300_sched_init(irq_handler_t vector)
asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
- if (request_irq(IRQ_AUTO_6, hp300_tick,
IRQ_FLG_STD
, "timer tick", vector))
+ if (request_irq(IRQ_AUTO_6, hp300_tick,
0
, "timer tick", vector))
pr_err("Couldn't register timer interrupt\n");
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
pr_err("Couldn't register timer interrupt\n");
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */