diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /arch/blackfin/mach-bf533/include/mach/irq.h | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'arch/blackfin/mach-bf533/include/mach/irq.h')
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/irq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf533/include/mach/irq.h b/arch/blackfin/mach-bf533/include/mach/irq.h index c31498be0bbb..1f7e9765d954 100644 --- a/arch/blackfin/mach-bf533/include/mach/irq.h +++ b/arch/blackfin/mach-bf533/include/mach/irq.h | |||
| @@ -104,7 +104,8 @@ Core Emulation ** | |||
| 104 | 104 | ||
| 105 | #define GPIO_IRQ_BASE IRQ_PF0 | 105 | #define GPIO_IRQ_BASE IRQ_PF0 |
| 106 | 106 | ||
| 107 | #define NR_IRQS (IRQ_PF15+1) | 107 | #define NR_MACH_IRQS (IRQ_PF15 + 1) |
| 108 | #define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS) | ||
| 108 | 109 | ||
| 109 | #define IVG7 7 | 110 | #define IVG7 7 |
| 110 | #define IVG8 8 | 111 | #define IVG8 8 |