소스 검색

[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>
Arnd Bergmann 18 년 전
부모
커밋
d665840867
2개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 0
      arch/powerpc/platforms/52xx/efika.c
  2. 2 1
      arch/powerpc/platforms/embedded6xx/linkstation.c

+ 2 - 0
arch/powerpc/platforms/52xx/efika.c

@@ -252,6 +252,8 @@ define_machine(efika)
 	.progress		= rtas_progress,
 	.progress		= rtas_progress,
 	.get_boot_time		= rtas_get_boot_time,
 	.get_boot_time		= rtas_get_boot_time,
 	.calibrate_decr		= generic_calibrate_decr,
 	.calibrate_decr		= generic_calibrate_decr,
+#ifdef CONFIG_PCI
 	.phys_mem_access_prot	= pci_phys_mem_access_prot,
 	.phys_mem_access_prot	= pci_phys_mem_access_prot,
+#endif
 };
 };
 
 

+ 2 - 1
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)
 static int __init linkstation_add_bridge(struct device_node *dev)
 {
 {
+#ifdef CONFIG_PCI
 	int len;
 	int len;
 	struct pci_controller *hose;
 	struct pci_controller *hose;
 	const int *bus_range;
 	const int *bus_range;
@@ -78,7 +79,7 @@ static int __init linkstation_add_bridge(struct device_node *dev)
 	/* Interpret the "ranges" property */
 	/* Interpret the "ranges" property */
 	/* This also maps the I/O region and sets isa_io/mem_base */
 	/* This also maps the I/O region and sets isa_io/mem_base */
 	pci_process_bridge_OF_ranges(hose, dev, 1);
 	pci_process_bridge_OF_ranges(hose, dev, 1);
-
+#endif
 	return 0;
 	return 0;
 }
 }