git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[sfrench/cifs-2.6.git]
/
include
/
asm-cris
/
irq.h
diff --git
a/include/asm-cris/irq.h
b/include/asm-cris/irq.h
index 8e787fdaedd41835db69807807278d953b337c34..4fab5c3b2e15ca4ee294346535d14456145c520e 100644
(file)
--- a/
include/asm-cris/irq.h
+++ b/
include/asm-cris/irq.h
@@
-1,6
+1,11
@@
#ifndef _ASM_IRQ_H
#define _ASM_IRQ_H
+/*
+ * IRQ line status macro IRQ_PER_CPU is used
+ */
+#define ARCH_HAS_IRQ_PER_CPU
+
#include <asm/arch/irq.h>
extern __inline__ int irq_canonicalize(int irq)