From f1344bbd77fa0130b6a92c9f32b4dfecf73151e2 Mon Sep 17 00:00:00 2001
From: Wojtek Kaniewski <wojtekka@toxygen.net>
Date: Wed, 8 Nov 2006 19:52:57 -0800
Subject: [PATCH] --- yaml --- r: 42247 b: refs/heads/master c:
 1d30593e4c406c753e395676ba8b58600ccccbc1 h: refs/heads/master i:   42245:
 26ef862d93db8ce25e28e75f26c0be7c9a7e6bfe   42243:
 bf43a111dc95a9347488671a2c92d7ff1ff7600d   42239:
 7e3b0397eec3a76c5a7eed51167171d6384cfba0 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/ppc/platforms/4xx/bubinga.c | 2 ++
 trunk/arch/ppc/platforms/4xx/cpci405.c | 2 ++
 trunk/arch/ppc/platforms/4xx/ep405.c   | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 17a15e71c8c9..0bfd6555c17c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a0005c26aea9d470cf80c392d3bf2039dc4679
+refs/heads/master: 1d30593e4c406c753e395676ba8b58600ccccbc1
diff --git a/trunk/arch/ppc/platforms/4xx/bubinga.c b/trunk/arch/ppc/platforms/4xx/bubinga.c
index 4009f4983ca6..75857b38e894 100644
--- a/trunk/arch/ppc/platforms/4xx/bubinga.c
+++ b/trunk/arch/ppc/platforms/4xx/bubinga.c
@@ -116,6 +116,7 @@ bubinga_early_serial_map(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 
 	unsigned int bar_response, bar;
 	/*
@@ -211,6 +212,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 	printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
 	printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
 
+#endif
 #endif
 }
 
diff --git a/trunk/arch/ppc/platforms/4xx/cpci405.c b/trunk/arch/ppc/platforms/4xx/cpci405.c
index 367430998fc5..8474b05b795a 100644
--- a/trunk/arch/ppc/platforms/4xx/cpci405.c
+++ b/trunk/arch/ppc/platforms/4xx/cpci405.c
@@ -126,6 +126,7 @@ cpci405_setup_arch(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 	unsigned int bar_response, bar;
 
 	/* Disable region first */
@@ -167,6 +168,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 					PCI_FUNC(hose->first_busno), bar,
 					&bar_response);
 	}
+#endif
 }
 
 void __init
diff --git a/trunk/arch/ppc/platforms/4xx/ep405.c b/trunk/arch/ppc/platforms/4xx/ep405.c
index ae5c82081c95..e5adf9ba1fca 100644
--- a/trunk/arch/ppc/platforms/4xx/ep405.c
+++ b/trunk/arch/ppc/platforms/4xx/ep405.c
@@ -68,6 +68,7 @@ ep405_setup_arch(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 	unsigned int bar_response, bar;
 	/*
 	 * Expected PCI mapping:
@@ -130,6 +131,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 		    PCI_FUNC(hose->first_busno), bar, bar_response);
 	}
 	/* end work arround */
+#endif
 }
 
 void __init