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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
tick14.c
diff --git
a/arch/sparc/kernel/tick14.c
b/arch/sparc/kernel/tick14.c
index
591547a
..
d3b4daa
100644
(file)
--- a/
arch/sparc/kernel/tick14.c
+++ b/
arch/sparc/kernel/tick14.c
@@
-74,7
+74,7
@@
void claim_ticker14(irqreturn_t (*handler)(int, void *, struct pt_regs *),
if (!request_irq(irq_nr,
handler,
- (
SA_INTERRUPT
| SA_STATIC_ALLOC),
+ (
IRQF_DISABLED
| SA_STATIC_ALLOC),
"counter14",
NULL)) {
install_linux_ticker();