diff options
author | Len Brown <len.brown@intel.com> | 2005-08-25 12:27:09 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:40:44 -0400 |
commit | 6153df7b2f4d27c8bde054db1b947369a6f64d83 (patch) | |
tree | 2e30598ad48d05d0ea956b6097e0943a178d6299 /arch/i386/kernel/acpi | |
parent | 07fefe4ca93b3e45b2bea32871a4496067888852 (diff) |
[ACPI] delete CONFIG_ACPI_PCI
Delete the ability to build an ACPI kernel that does
not include PCI support. When such a machine is created
and it requires a tuned kernel, send a patch.
http://bugzilla.kernel.org/show_bug.cgi?id=1364
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/acpi')
-rw-r--r-- | arch/i386/kernel/acpi/boot.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 552fc85691ac..0fb23c30eb98 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
@@ -66,13 +66,8 @@ static inline int ioapic_setup_disabled(void) | |||
66 | 66 | ||
67 | #define PREFIX "ACPI: " | 67 | #define PREFIX "ACPI: " |
68 | 68 | ||
69 | #ifdef CONFIG_ACPI_PCI | ||
70 | int acpi_noirq __initdata; /* skip ACPI IRQ initialization */ | 69 | int acpi_noirq __initdata; /* skip ACPI IRQ initialization */ |
71 | int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */ | 70 | int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */ |
72 | #else | ||
73 | int acpi_noirq __initdata = 1; | ||
74 | int acpi_pci_disabled __initdata = 1; | ||
75 | #endif | ||
76 | int acpi_ht __initdata = 1; /* enable HT */ | 71 | int acpi_ht __initdata = 1; /* enable HT */ |
77 | 72 | ||
78 | int acpi_lapic; | 73 | int acpi_lapic; |
@@ -849,7 +844,6 @@ extern int acpi_force; | |||
849 | 844 | ||
850 | #ifdef __i386__ | 845 | #ifdef __i386__ |
851 | 846 | ||
852 | #ifdef CONFIG_ACPI_PCI | ||
853 | static int __init disable_acpi_irq(struct dmi_system_id *d) | 847 | static int __init disable_acpi_irq(struct dmi_system_id *d) |
854 | { | 848 | { |
855 | if (!acpi_force) { | 849 | if (!acpi_force) { |
@@ -869,7 +863,6 @@ static int __init disable_acpi_pci(struct dmi_system_id *d) | |||
869 | } | 863 | } |
870 | return 0; | 864 | return 0; |
871 | } | 865 | } |
872 | #endif | ||
873 | 866 | ||
874 | static int __init dmi_disable_acpi(struct dmi_system_id *d) | 867 | static int __init dmi_disable_acpi(struct dmi_system_id *d) |
875 | { | 868 | { |
@@ -1017,7 +1010,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { | |||
1017 | }, | 1010 | }, |
1018 | }, | 1011 | }, |
1019 | 1012 | ||
1020 | #ifdef CONFIG_ACPI_PCI | ||
1021 | /* | 1013 | /* |
1022 | * Boxes that need ACPI PCI IRQ routing disabled | 1014 | * Boxes that need ACPI PCI IRQ routing disabled |
1023 | */ | 1015 | */ |
@@ -1055,7 +1047,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { | |||
1055 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), | 1047 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), |
1056 | }, | 1048 | }, |
1057 | }, | 1049 | }, |
1058 | #endif | ||
1059 | {} | 1050 | {} |
1060 | }; | 1051 | }; |
1061 | 1052 | ||