diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/Kconfig | 2 | ||||
-rw-r--r-- | arch/i386/pci/irq.c | 5 | ||||
-rw-r--r-- | arch/x86_64/Kconfig | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index e382f32d435e..dfd904f6883b 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -1163,7 +1163,7 @@ config PCI_DIRECT | |||
1163 | 1163 | ||
1164 | config PCI_MMCONFIG | 1164 | config PCI_MMCONFIG |
1165 | bool | 1165 | bool |
1166 | depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI)) | 1166 | depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
1167 | select ACPI_BOOT | 1167 | select ACPI_BOOT |
1168 | default y | 1168 | default y |
1169 | 1169 | ||
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index d6598da4b67b..da21b1d07c15 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
@@ -1029,7 +1029,6 @@ void pcibios_penalize_isa_irq(int irq) | |||
1029 | static int pirq_enable_irq(struct pci_dev *dev) | 1029 | static int pirq_enable_irq(struct pci_dev *dev) |
1030 | { | 1030 | { |
1031 | u8 pin; | 1031 | u8 pin; |
1032 | extern int via_interrupt_line_quirk; | ||
1033 | struct pci_dev *temp_dev; | 1032 | struct pci_dev *temp_dev; |
1034 | 1033 | ||
1035 | pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); | 1034 | pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); |
@@ -1084,10 +1083,6 @@ static int pirq_enable_irq(struct pci_dev *dev) | |||
1084 | printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n", | 1083 | printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n", |
1085 | 'A' + pin, pci_name(dev), msg); | 1084 | 'A' + pin, pci_name(dev), msg); |
1086 | } | 1085 | } |
1087 | /* VIA bridges use interrupt line for apic/pci steering across | ||
1088 | the V-Link */ | ||
1089 | else if (via_interrupt_line_quirk) | ||
1090 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq & 15); | ||
1091 | return 0; | 1086 | return 0; |
1092 | } | 1087 | } |
1093 | 1088 | ||
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 82cb2a3f127a..0f430d9d3632 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
@@ -421,7 +421,7 @@ config PCI_DIRECT | |||
421 | 421 | ||
422 | config PCI_MMCONFIG | 422 | config PCI_MMCONFIG |
423 | bool "Support mmconfig PCI config space access" | 423 | bool "Support mmconfig PCI config space access" |
424 | depends on PCI | 424 | depends on PCI && ACPI |
425 | select ACPI_BOOT | 425 | select ACPI_BOOT |
426 | 426 | ||
427 | config UNORDERED_IO | 427 | config UNORDERED_IO |