diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-30 03:57:46 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 03:57:46 +0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /include/asm-mips/hw_irq.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
| download | linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.xz | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/asm-mips/hw_irq.h')
| -rw-r--r-- | include/asm-mips/hw_irq.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/hw_irq.h b/include/asm-mips/hw_irq.h index c854d017c0e5..458d9fdc76bf 100644 --- a/include/asm-mips/hw_irq.h +++ b/include/asm-mips/hw_irq.h @@ -19,9 +19,9 @@ extern void init_8259A(int aeoi); extern atomic_t irq_err_count; -/* This may not be apropriate for all machines, we'll see ... */ -static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) -{ -} +/* + * interrupt-retrigger: NOP for now. This may not be apropriate for all + * machines, we'll see ... + */ #endif /* __ASM_HW_IRQ_H */ |