diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /include/asm-parisc/irq.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/asm-parisc/irq.h')
| -rw-r--r-- | include/asm-parisc/irq.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-parisc/irq.h b/include/asm-parisc/irq.h index 377ba90c7d02..5cae260615a2 100644 --- a/include/asm-parisc/irq.h +++ b/include/asm-parisc/irq.h | |||
| @@ -26,11 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #define NR_IRQS (CPU_IRQ_MAX + 1) | 27 | #define NR_IRQS (CPU_IRQ_MAX + 1) |
| 28 | 28 | ||
| 29 | /* | ||
| 30 | * IRQ line status macro IRQ_PER_CPU is used | ||
| 31 | */ | ||
| 32 | #define ARCH_HAS_IRQ_PER_CPU | ||
| 33 | |||
| 34 | static __inline__ int irq_canonicalize(int irq) | 29 | static __inline__ int irq_canonicalize(int irq) |
| 35 | { | 30 | { |
| 36 | return (irq == 2) ? 9 : irq; | 31 | return (irq == 2) ? 9 : irq; |