Skip to content

L
linux
Commit 39aa655b authored by Len Brown's avatar Len Brown Committed by Len Brown
Browse files
Options

[ACPI] fix IA64 build warning 

from Martin Hicks
parent 1e1b8dae
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
drivers/acpi/pci_irq.c
View file @ 39aa655b
...@@ -315,7 +315,6 @@ acpi_pci_irq_enable ( ...@@ -315,7 +315,6 @@ acpi_pci_irq_enable (
{ {
int irq = 0; int irq = 0;
u8 pin = 0; u8 pin = 0;
static u16 irq_mask = 0;
ACPI_FUNCTION_TRACE("acpi_pci_irq_enable"); ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
...@@ -372,11 +371,14 @@ acpi_pci_irq_enable ( ...@@ -372,11 +371,14 @@ acpi_pci_irq_enable (
* Make sure all (legacy) PCI IRQs are set as level-triggered. * Make sure all (legacy) PCI IRQs are set as level-triggered.
*/ */
#ifdef CONFIG_X86 #ifdef CONFIG_X86
{
static u16 irq_mask;
if ((dev->irq < 16) && !((1 << dev->irq) & irq_mask)) { if ((dev->irq < 16) && !((1 << dev->irq) & irq_mask)) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Setting IRQ %d as level-triggered\n", dev->irq)); ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Setting IRQ %d as level-triggered\n", dev->irq));
irq_mask |= (1 << dev->irq); irq_mask |= (1 << dev->irq);
eisa_set_level_irq(dev->irq); eisa_set_level_irq(dev->irq);
} }
}
#endif #endif
#ifdef CONFIG_IOSAPIC #ifdef CONFIG_IOSAPIC
if (acpi_irq_model == ACPI_IRQ_MODEL_IOSAPIC) if (acpi_irq_model == ACPI_IRQ_MODEL_IOSAPIC)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7