diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-11-04 13:22:46 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-08 14:15:33 +1100 |
| commit | 18244cfbc34e6bb3793977739b359a248899f42a (patch) | |
| tree | c82a81fd92d2c93fd31ef83ba3baa516428b9120 /arch | |
| parent | f2205fbb5a8933514fd343cc329df631802b4543 (diff) | |
| download | linux-18244cfbc34e6bb3793977739b359a248899f42a.tar.gz linux-18244cfbc34e6bb3793977739b359a248899f42a.tar.bz2 linux-18244cfbc34e6bb3793977739b359a248899f42a.zip | |
[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>
Diffstat (limited to 'arch')
| -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 @@ #ifndef _ISERIES_IRQ_H #define _ISERIES_IRQ_H +#ifdef CONFIG_PCI extern void iSeries_init_IRQ(void); extern int iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, u32); extern void iSeries_activate_IRQs(void); +#else +#define iSeries_init_IRQ NULL +#endif extern unsigned int iSeries_get_irq(void); #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) } } -#ifndef CONFIG_PCI -void __init iSeries_init_IRQ(void) { } -#endif - static void __iomem *iseries_ioremap(phys_addr_t address, unsigned long size, unsigned long flags) { |