diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2007-06-18 01:06:57 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 01:56:53 -0500 |
| commit | d66584086717f6dda76d523ef58363deaa3efe51 (patch) | |
| tree | 3b89cca3f5f54f8912f0a8b354193ff9454ae954 /arch | |
| parent | 3dfaa762b59743719f00f2dc2f559de59f5502f7 (diff) | |
| download | blackbird-op-linux-d66584086717f6dda76d523ef58363deaa3efe51.tar.gz blackbird-op-linux-d66584086717f6dda76d523ef58363deaa3efe51.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/52xx/efika.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 3 |
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) .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/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[] = { 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; } |
