diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-11-03 22:22:46 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-11-07 22:15:33 -0500 |
commit | 18244cfbc34e6bb3793977739b359a248899f42a (patch) | |
tree | c82a81fd92d2c93fd31ef83ba3baa516428b9120 | |
parent | f2205fbb5a8933514fd343cc329df631802b4543 (diff) |
[POWERPC] iSeries_init_IRQ non-PCI tidy
ppc_md.init_IRQ is not called if it is NULL, so we don't need an empty
routine in the non PCI case.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/platforms/iseries/irq.h | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/iseries/irq.h b/arch/powerpc/platforms/iseries/irq.h index 69f1b437fc7b..a1c236074034 100644 --- a/arch/powerpc/platforms/iseries/irq.h +++ b/arch/powerpc/platforms/iseries/irq.h | |||
@@ -1,9 +1,13 @@ | |||
1 | #ifndef _ISERIES_IRQ_H | 1 | #ifndef _ISERIES_IRQ_H |
2 | #define _ISERIES_IRQ_H | 2 | #define _ISERIES_IRQ_H |
3 | 3 | ||
4 | #ifdef CONFIG_PCI | ||
4 | extern void iSeries_init_IRQ(void); | 5 | extern void iSeries_init_IRQ(void); |
5 | extern int iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, u32); | 6 | extern int iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, u32); |
6 | extern void iSeries_activate_IRQs(void); | 7 | extern void iSeries_activate_IRQs(void); |
8 | #else | ||
9 | #define iSeries_init_IRQ NULL | ||
10 | #endif | ||
7 | extern unsigned int iSeries_get_irq(void); | 11 | extern unsigned int iSeries_get_irq(void); |
8 | 12 | ||
9 | #endif /* _ISERIES_IRQ_H */ | 13 | #endif /* _ISERIES_IRQ_H */ |
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 37ae07ee54a9..0877a8834110 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -617,10 +617,6 @@ static void iseries_dedicated_idle(void) | |||
617 | } | 617 | } |
618 | } | 618 | } |
619 | 619 | ||
620 | #ifndef CONFIG_PCI | ||
621 | void __init iSeries_init_IRQ(void) { } | ||
622 | #endif | ||
623 | |||
624 | static void __iomem *iseries_ioremap(phys_addr_t address, unsigned long size, | 620 | static void __iomem *iseries_ioremap(phys_addr_t address, unsigned long size, |
625 | unsigned long flags) | 621 | unsigned long flags) |
626 | { | 622 | { |