From 35939c6a12494bffecab78a5b45747d240c03c2c Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sun, 17 Apr 2011 13:49:55 +0200
Subject: [PATCH] --- yaml --- r: 247887 b: refs/heads/master c:
 06010fb588700e7fcb29e720c56884e3de5fd327 h: refs/heads/master i:   247885:
 ec86a2869c65a4b4039446f979999e5f358c7b81   247883:
 f1b396625a0e4b8a74244f4f37012265e3cab135   247879:
 674ff1a30c7c97b8d76f7a5d67849197baba64c0   247871:
 cdfc4fc10cda177833d31172e36745e3e687a59d v: v3

---
 [refs]                              |  2 +-
 trunk/arch/sparc/include/asm/pcic.h | 12 +++++++++---
 trunk/arch/sparc/kernel/irq_32.c    |  9 +++------
 trunk/arch/sparc/kernel/time_32.c   | 10 +++-------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 4dbe3e85cdf4..16941b059c00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db1cdd146a0814b6f312fe1a7fa1ab87ac177b2a
+refs/heads/master: 06010fb588700e7fcb29e720c56884e3de5fd327
diff --git a/trunk/arch/sparc/include/asm/pcic.h b/trunk/arch/sparc/include/asm/pcic.h
index f20ef562b265..7eb5d78f5211 100644
--- a/trunk/arch/sparc/include/asm/pcic.h
+++ b/trunk/arch/sparc/include/asm/pcic.h
@@ -29,11 +29,17 @@ struct linux_pcic {
 	int			pcic_imdim;
 };
 
-extern int pcic_probe(void);
-/* Erm... MJ redefined pcibios_present() so that it does not work early. */
+#ifdef CONFIG_PCI
 extern int pcic_present(void);
+extern int pcic_probe(void);
+extern void pci_time_init(void);
 extern void sun4m_pci_init_IRQ(void);
-
+#else
+static inline int pcic_present(void) { return 0; }
+static inline int pcic_probe(void) { return 0; }
+static inline void pci_time_init(void) {}
+static inline void sun4m_pci_init_IRQ(void) {}
+#endif
 #endif
 
 /* Size of PCI I/O space which we relocate. */
diff --git a/trunk/arch/sparc/kernel/irq_32.c b/trunk/arch/sparc/kernel/irq_32.c
index 7c93df4099cb..b2dbb4ba8608 100644
--- a/trunk/arch/sparc/kernel/irq_32.c
+++ b/trunk/arch/sparc/kernel/irq_32.c
@@ -607,14 +607,11 @@ void __init init_IRQ(void)
 		break;
 
 	case sun4m:
-#ifdef CONFIG_PCI
 		pcic_probe();
-		if (pcic_present()) {
+		if (pcic_present())
 			sun4m_pci_init_IRQ();
-			break;
-		}
-#endif
-		sun4m_init_IRQ();
+		else
+			sun4m_init_IRQ();
 		break;
 
 	case sun4d:
diff --git a/trunk/arch/sparc/kernel/time_32.c b/trunk/arch/sparc/kernel/time_32.c
index 4e236391b635..b61840300101 100644
--- a/trunk/arch/sparc/kernel/time_32.c
+++ b/trunk/arch/sparc/kernel/time_32.c
@@ -228,14 +228,10 @@ static void __init sbus_time_init(void)
 
 void __init time_init(void)
 {
-#ifdef CONFIG_PCI
-	extern void pci_time_init(void);
-	if (pcic_present()) {
+	if (pcic_present())
 		pci_time_init();
-		return;
-	}
-#endif
-	sbus_time_init();
+	else
+		sbus_time_init();
 }