diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 3 | ||||
-rw-r--r-- | arch/x86/pci/irq.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 680b7300a489..2cdc9de9371d 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -72,7 +72,8 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return | |||
72 | #define PREFIX "ACPI: " | 72 | #define PREFIX "ACPI: " |
73 | 73 | ||
74 | int acpi_noirq; /* skip ACPI IRQ initialization */ | 74 | int acpi_noirq; /* skip ACPI IRQ initialization */ |
75 | int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */ | 75 | int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */ |
76 | EXPORT_SYMBOL(acpi_pci_disabled); | ||
76 | int acpi_ht __initdata = 1; /* enable HT */ | 77 | int acpi_ht __initdata = 1; /* enable HT */ |
77 | 78 | ||
78 | int acpi_lapic; | 79 | int acpi_lapic; |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index ed07ce6c171b..a8715861877e 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
@@ -583,6 +583,10 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
583 | case PCI_DEVICE_ID_INTEL_ICH9_4: | 583 | case PCI_DEVICE_ID_INTEL_ICH9_4: |
584 | case PCI_DEVICE_ID_INTEL_ICH9_5: | 584 | case PCI_DEVICE_ID_INTEL_ICH9_5: |
585 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: | 585 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: |
586 | case PCI_DEVICE_ID_INTEL_ICH10_0: | ||
587 | case PCI_DEVICE_ID_INTEL_ICH10_1: | ||
588 | case PCI_DEVICE_ID_INTEL_ICH10_2: | ||
589 | case PCI_DEVICE_ID_INTEL_ICH10_3: | ||
586 | r->name = "PIIX/ICH"; | 590 | r->name = "PIIX/ICH"; |
587 | r->get = pirq_piix_get; | 591 | r->get = pirq_piix_get; |
588 | r->set = pirq_piix_set; | 592 | r->set = pirq_piix_set; |