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 'master' into upstream-fixes
[sfrench/cifs-2.6.git]
/
include
/
asm-blackfin
/
mach-bf561
/
irq.h
diff --git
a/include/asm-blackfin/mach-bf561/irq.h
b/include/asm-blackfin/mach-bf561/irq.h
index a753ce720d74a935ee135228e863f099b04d984c..83f0383957d25e099f36e04c139bf4197e7d705c 100644
(file)
--- a/
include/asm-blackfin/mach-bf561/irq.h
+++ b/
include/asm-blackfin/mach-bf561/irq.h
@@
-289,11
+289,9
@@
#define IRQ_PF46 119
#define IRQ_PF47 120
-#ifdef CONFIG_IRQCHIP_DEMUX_GPIO
+#define GPIO_IRQ_BASE IRQ_PF0
+
#define NR_IRQS (IRQ_PF47 + 1)
-#else
-#define NR_IRQS SYS_IRQS
-#endif
#define IVG7 7
#define IVG8 8