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-v850/hw_irq.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/asm-v850/hw_irq.h')
| -rw-r--r-- | include/asm-v850/hw_irq.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-v850/hw_irq.h b/include/asm-v850/hw_irq.h index a8aab4342712..043e94bb6bd8 100644 --- a/include/asm-v850/hw_irq.h +++ b/include/asm-v850/hw_irq.h | |||
| @@ -1,8 +1,4 @@ | |||
| 1 | #ifndef __V850_HW_IRQ_H__ | 1 | #ifndef __V850_HW_IRQ_H__ |
| 2 | #define __V850_HW_IRQ_H__ | 2 | #define __V850_HW_IRQ_H__ |
| 3 | 3 | ||
| 4 | static inline void hw_resend_irq (struct hw_interrupt_type *h, unsigned int i) | ||
| 5 | { | ||
| 6 | } | ||
| 7 | |||
| 8 | #endif /* __V850_HW_IRQ_H__ */ | 4 | #endif /* __V850_HW_IRQ_H__ */ |