diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /include/asm-ppc64/iSeries/iSeries_irq.h | |
| parent | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc64/iSeries/iSeries_irq.h')
| -rw-r--r-- | include/asm-ppc64/iSeries/iSeries_irq.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/asm-ppc64/iSeries/iSeries_irq.h b/include/asm-ppc64/iSeries/iSeries_irq.h index ff8ddede038c..6c9767ac1302 100644 --- a/include/asm-ppc64/iSeries/iSeries_irq.h +++ b/include/asm-ppc64/iSeries/iSeries_irq.h | |||
| @@ -1,19 +1,8 @@ | |||
| 1 | #ifndef __ISERIES_IRQ_H__ | 1 | #ifndef __ISERIES_IRQ_H__ |
| 2 | #define __ISERIES_IRQ_H__ | 2 | #define __ISERIES_IRQ_H__ |
| 3 | 3 | ||
| 4 | #ifdef __cplusplus | 4 | extern void iSeries_init_IRQ(void); |
| 5 | extern "C" { | 5 | extern int iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, HvAgentId); |
| 6 | #endif | 6 | extern void iSeries_activate_IRQs(void); |
| 7 | |||
| 8 | void iSeries_init_IRQ(void); | ||
| 9 | int iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, HvAgentId); | ||
| 10 | int iSeries_assign_IRQ(int, HvBusNumber, HvSubBusNumber, HvAgentId); | ||
| 11 | void iSeries_activate_IRQs(void); | ||
| 12 | |||
| 13 | int XmPciLpEvent_init(void); | ||
| 14 | |||
| 15 | #ifdef __cplusplus | ||
| 16 | } | ||
| 17 | #endif | ||
| 18 | 7 | ||
| 19 | #endif /* __ISERIES_IRQ_H__ */ | 8 | #endif /* __ISERIES_IRQ_H__ */ |