From 86ea4d30c8bfbb440699f0ebd7923e30af00f849 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 4 Nov 2007 13:22:46 +1100
Subject: [PATCH] --- yaml --- r: 73321 b: refs/heads/master c:
 18244cfbc34e6bb3793977739b359a248899f42a h: refs/heads/master i:   73319:
 b4bd0ad05d0dec1a847e417ea2fa52b6e1c49a10 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/iseries/irq.h   | 4 ++++
 trunk/arch/powerpc/platforms/iseries/setup.c | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 557f4579cfce..01305e7e37f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2205fbb5a8933514fd343cc329df631802b4543
+refs/heads/master: 18244cfbc34e6bb3793977739b359a248899f42a
diff --git a/trunk/arch/powerpc/platforms/iseries/irq.h b/trunk/arch/powerpc/platforms/iseries/irq.h
index 69f1b437fc7b..a1c236074034 100644
--- a/trunk/arch/powerpc/platforms/iseries/irq.h
+++ b/trunk/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/trunk/arch/powerpc/platforms/iseries/setup.c b/trunk/arch/powerpc/platforms/iseries/setup.c
index 37ae07ee54a9..0877a8834110 100644
--- a/trunk/arch/powerpc/platforms/iseries/setup.c
+++ b/trunk/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)
 {