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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
mn10300
/
include
/
asm
/
irq.h
diff --git
a/arch/mn10300/include/asm/irq.h
b/arch/mn10300/include/asm/irq.h
index
25c045d
..
1a73fb3
100644
(file)
--- a/
arch/mn10300/include/asm/irq.h
+++ b/
arch/mn10300/include/asm/irq.h
@@
-21,8
+21,16
@@
/* this number is used when no interrupt has been assigned */
#define NO_IRQ INT_MAX
/* this number is used when no interrupt has been assigned */
#define NO_IRQ INT_MAX
-/* hardware irq numbers */
-#define NR_IRQS GxICR_NUM_IRQS
+/*
+ * hardware irq numbers
+ * - the ASB2364 has an FPGA with an IRQ multiplexer on it
+ */
+#ifdef CONFIG_MN10300_UNIT_ASB2364
+#include <unit/irq.h>
+#else
+#define NR_CPU_IRQS GxICR_NUM_IRQS
+#define NR_IRQS NR_CPU_IRQS
+#endif
/* external hardware irq numbers */
#define NR_XIRQS GxICR_NUM_XIRQS
/* external hardware irq numbers */
#define NR_XIRQS GxICR_NUM_XIRQS