aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:41 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:41 -0400
commitf157cbb1eb9ce3f33a401ec6d20eb3eb852351a3 (patch)
tree8c3af952bac000951430ede5806582bcb62262ac /arch/i386
parent658fdbef66e5e9be79b457edc2cbbb3add840aa9 (diff)
[PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
This is useful on systems with broken PCI bus. Affects various scans in x86-64 and i386's early ACPI quirk scan. Cc: gregkh@suse.de Cc: len.brown@intel.com Cc: Trammell Hudson <hudson@osresearch.net> Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/acpi/Makefile2
-rw-r--r--arch/i386/kernel/setup.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index 7e9ac99354f4..7f7be01f44e6 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -1,5 +1,7 @@
1obj-$(CONFIG_ACPI) += boot.o 1obj-$(CONFIG_ACPI) += boot.o
2ifneq ($(CONFIG_PCI),)
2obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o 3obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
4endif
3obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o 5obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
4 6
5ifneq ($(CONFIG_ACPI_PROCESSOR),) 7ifneq ($(CONFIG_ACPI_PROCESSOR),)
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index ea17567dbe72..7a99b1369fa2 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1437,9 +1437,11 @@ void __init setup_arch(char **cmdline_p)
1437 acpi_boot_table_init(); 1437 acpi_boot_table_init();
1438#endif 1438#endif
1439 1439
1440#ifdef CONFIG_PCI
1440#ifdef CONFIG_X86_IO_APIC 1441#ifdef CONFIG_X86_IO_APIC
1441 check_acpi_pci(); /* Checks more than just ACPI actually */ 1442 check_acpi_pci(); /* Checks more than just ACPI actually */
1442#endif 1443#endif
1444#endif
1443 1445
1444#ifdef CONFIG_ACPI 1446#ifdef CONFIG_ACPI
1445 acpi_boot_init(); 1447 acpi_boot_init();