diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/linux/irqnr.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/irqnr.h')
| -rw-r--r-- | include/linux/irqnr.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h index 5504a5c97836..86af92e9e84c 100644 --- a/include/linux/irqnr.h +++ b/include/linux/irqnr.h | |||
| @@ -8,7 +8,12 @@ | |||
| 8 | 8 | ||
| 9 | #ifndef CONFIG_GENERIC_HARDIRQS | 9 | #ifndef CONFIG_GENERIC_HARDIRQS |
| 10 | #include <asm/irq.h> | 10 | #include <asm/irq.h> |
| 11 | # define nr_irqs NR_IRQS | 11 | |
| 12 | /* | ||
| 13 | * Wrappers for non-genirq architectures: | ||
| 14 | */ | ||
| 15 | #define nr_irqs NR_IRQS | ||
| 16 | #define irq_to_desc(irq) (&irq_desc[irq]) | ||
| 12 | 17 | ||
| 13 | # define for_each_irq_desc(irq, desc) \ | 18 | # define for_each_irq_desc(irq, desc) \ |
| 14 | for (irq = 0; irq < nr_irqs; irq++) | 19 | for (irq = 0; irq < nr_irqs; irq++) |