diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:28 -0400 |
| commit | be883da7594b0a2a02074e683673ae0e522566a4 (patch) | |
| tree | b62f2a8a069fb4d389935c0b2de9bc78798f50c2 /include/asm-sparc/irq.h | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
| parent | 4c5eb38af2131d867842cdd09fa83a3ed77bfd26 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC64]: Don't double-export synchronize_irq.
[SPARC64]: Move over to GENERIC_HARDIRQS.
[SPARC64]: Virtualize IRQ numbers.
[SPARC64]: Kill ino_bucket->pil
[SPARC]: Kill __irq_itoa().
[SPARC64]: bp->pil can never be zero
[SPARC64]: Send all device interrupts via one PIL.
[SPARC]: Fix iommu_flush_iotlb end address
[SPARC]: Mark smp init functions as cpuinit
[SPARC]: Add missing rw can_lock macros
[SPARC]: Setup cpu_possible_map
[SPARC]: Add topology_init()
Diffstat (limited to 'include/asm-sparc/irq.h')
| -rw-r--r-- | include/asm-sparc/irq.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h index dbc687403208..f2d64537e29d 100644 --- a/include/asm-sparc/irq.h +++ b/include/asm-sparc/irq.h | |||
| @@ -16,8 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #define __irq_ino(irq) irq | 17 | #define __irq_ino(irq) irq |
| 18 | #define __irq_pil(irq) irq | 18 | #define __irq_pil(irq) irq |
| 19 | BTFIXUPDEF_CALL(char *, __irq_itoa, unsigned int) | ||
| 20 | #define __irq_itoa(irq) BTFIXUP_CALL(__irq_itoa)(irq) | ||
| 21 | 19 | ||
| 22 | #define NR_IRQS 16 | 20 | #define NR_IRQS 16 |
| 23 | 21 | ||