From 7cde81336138f1664efcd3274fa8ed5c2ee7e410 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 18 Jun 2007 01:06:57 +0200
Subject: [PATCH] --- yaml --- r: 60607 b: refs/heads/master c:
 d66584086717f6dda76d523ef58363deaa3efe51 h: refs/heads/master i:   60605:
 264f54ca85bdebf7962745feae66fae3ba511b20   60603:
 e826b68980f03349206ac8b2eb274966faa139ea   60599:
 c351c85e05ebd33cbd44805567a44165944099c7   60591:
 d53932e16eff02ba28c5649641be9b4a86641f09   60575:
 cfb9f0e60fb37e2e0d037f1bcfc26d727b98fa01   60543:
 26698842bcbccf20a897dc62cb2a63850b3527d2 v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/powerpc/platforms/52xx/efika.c              | 2 ++
 trunk/arch/powerpc/platforms/embedded6xx/linkstation.c | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7fbf4370ad82..ac0a7b595523 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dfaa762b59743719f00f2dc2f559de59f5502f7
+refs/heads/master: d66584086717f6dda76d523ef58363deaa3efe51
diff --git a/trunk/arch/powerpc/platforms/52xx/efika.c b/trunk/arch/powerpc/platforms/52xx/efika.c
index f591a9fc19b9..4cb441975ff7 100644
--- a/trunk/arch/powerpc/platforms/52xx/efika.c
+++ b/trunk/arch/powerpc/platforms/52xx/efika.c
@@ -252,6 +252,8 @@ define_machine(efika)
 	.progress		= rtas_progress,
 	.get_boot_time		= rtas_get_boot_time,
 	.calibrate_decr		= generic_calibrate_decr,
+#ifdef CONFIG_PCI
 	.phys_mem_access_prot	= pci_phys_mem_access_prot,
+#endif
 };
 
diff --git a/trunk/arch/powerpc/platforms/embedded6xx/linkstation.c b/trunk/arch/powerpc/platforms/embedded6xx/linkstation.c
index f3ae0a728158..885c789a8c2d 100644
--- a/trunk/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/trunk/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -56,6 +56,7 @@ static struct mtd_partition linkstation_physmap_partitions[] = {
 
 static int __init linkstation_add_bridge(struct device_node *dev)
 {
+#ifdef CONFIG_PCI
 	int len;
 	struct pci_controller *hose;
 	const int *bus_range;
@@ -78,7 +79,7 @@ static int __init linkstation_add_bridge(struct device_node *dev)
 	/* Interpret the "ranges" property */
 	/* This also maps the I/O region and sets isa_io/mem_base */
 	pci_process_bridge_OF_ranges(hose, dev, 1);
-
+#endif
 	return 0;
 }