patch-2.4.27 linux-2.4.27/drivers/acpi/bus.c

• Lines: 13
• Date: 2004-08-07 16:26:04.650346613 -0700
• Orig file: linux-2.4.26/drivers/acpi/bus.c
• Orig date: 2004-04-14 06:05:28.000000000 -0700

diff -urN linux-2.4.26/drivers/acpi/bus.c linux-2.4.27/drivers/acpi/bus.c
@@ -1964,8 +1964,10 @@
 	acpi_ec_init();		/* ACPI Embedded Controller */
 #endif
 #ifdef CONFIG_ACPI_PCI
-	acpi_pci_link_init();	/* ACPI PCI Interrupt Link */
-	acpi_pci_root_init();	/* ACPI PCI Root Bridge */
+	if (!acpi_pci_disabled) {
+		acpi_pci_link_init();	/* ACPI PCI Interrupt Link */
+		acpi_pci_root_init();	/* ACPI PCI Root Bridge */
+	}
 #endif
 	/*
 	 * Enumerate devices in the ACPI namespace.