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-m32r/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-m32r/hw_irq.h')
-rw-r--r-- | include/asm-m32r/hw_irq.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-m32r/hw_irq.h b/include/asm-m32r/hw_irq.h index 8d7e9d0e09e8..7138537cda03 100644 --- a/include/asm-m32r/hw_irq.h +++ b/include/asm-m32r/hw_irq.h @@ -1,9 +1,4 @@ #ifndef _ASM_M32R_HW_IRQ_H #define _ASM_M32R_HW_IRQ_H -static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) -{ - /* Nothing to do */ -} - #endif /* _ASM_M32R_HW_IRQ_H */ |