]> err.no Git - linux-2.6/commitdiff
[POWERPC] fix building without PCI
authorArnd Bergmann <arnd@arndb.de>
Sun, 17 Jun 2007 23:06:57 +0000 (01:06 +0200)
committerKumar Gala <galak@kernel.crashing.org>
Fri, 29 Jun 2007 06:56:53 +0000 (01:56 -0500)
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>
arch/powerpc/platforms/52xx/efika.c
arch/powerpc/platforms/embedded6xx/linkstation.c

index f591a9fc19b9db179777d3f35f9597e00b19807c..4cb441975ff79b668792ffabe07cf6a846d9ff1b 100644 (file)
@@ -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
 };
 
index f3ae0a728158b6061ad4f02e69133feb080f9b4d..885c789a8c2d83fd86c4299bc228978c4d1a0e36 100644 (file)
@@ -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;
 }