diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 18:27:47 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 18:27:47 +0300 |
| commit | 9e7f7f5425e6d1492109a537ee88c99b29580655 (patch) | |
| tree | 81f9d68abb5b793aadaf80bd6940af04e3c16eb9 /drivers/acpi/pci_link.c | |
| parent | 6daa2ec0b3e3808c55329d12de3c157cf38b17b0 (diff) | |
| parent | f80fd3a5fff88a9ace7e8cd11d07cf874a63ea9f (diff) | |
| download | linux-9e7f7f5425e6d1492109a537ee88c99b29580655.tar.xz | |
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/pci_link.c')
| -rw-r--r-- | drivers/acpi/pci_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 8fc7323ed3e8..4ed4061813e6 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -839,7 +839,7 @@ void acpi_penalize_isa_irq(int irq, int active) { if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty))) acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) + - active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING; + (active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING); } bool acpi_isa_irq_available(int irq) |