aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2007-06-17 19:06:57 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-06-29 02:56:53 -0400
commitd66584086717f6dda76d523ef58363deaa3efe51 (patch)
tree3b89cca3f5f54f8912f0a8b354193ff9454ae954
parent3dfaa762b59743719f00f2dc2f559de59f5502f7 (diff)
[POWERPC] fix building without PCI
Some code looks can be configured to be built without PCI support, but does not work properly. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/powerpc/platforms/52xx/efika.c2
-rw-r--r--arch/powerpc/platforms/embedded6xx/linkstation.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index f591a9fc19b9..4cb441975ff7 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -252,6 +252,8 @@ define_machine(efika)
252 .progress = rtas_progress, 252 .progress = rtas_progress,
253 .get_boot_time = rtas_get_boot_time, 253 .get_boot_time = rtas_get_boot_time,
254 .calibrate_decr = generic_calibrate_decr, 254 .calibrate_decr = generic_calibrate_decr,
255#ifdef CONFIG_PCI
255 .phys_mem_access_prot = pci_phys_mem_access_prot, 256 .phys_mem_access_prot = pci_phys_mem_access_prot,
257#endif
256}; 258};
257 259
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index f3ae0a728158..885c789a8c2d 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -56,6 +56,7 @@ static struct mtd_partition linkstation_physmap_partitions[] = {
56 56
57static int __init linkstation_add_bridge(struct device_node *dev) 57static int __init linkstation_add_bridge(struct device_node *dev)
58{ 58{
59#ifdef CONFIG_PCI
59 int len; 60 int len;
60 struct pci_controller *hose; 61 struct pci_controller *hose;
61 const int *bus_range; 62 const int *bus_range;
@@ -78,7 +79,7 @@ static int __init linkstation_add_bridge(struct device_node *dev)
78 /* Interpret the "ranges" property */ 79 /* Interpret the "ranges" property */
79 /* This also maps the I/O region and sets isa_io/mem_base */ 80 /* This also maps the I/O region and sets isa_io/mem_base */
80 pci_process_bridge_OF_ranges(hose, dev, 1); 81 pci_process_bridge_OF_ranges(hose, dev, 1);
81 82#endif
82 return 0; 83 return 0;
83} 84}
84 85