diff options
| author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2007-02-02 19:48:22 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:29 -0500 |
| commit | 5f3b1a8b6737b09ce5df4ec9fad4ad271aecb5fb (patch) | |
| tree | 5b3e343ab0c4c963f681afc2bfbba815b26e045b /drivers/acpi/bus.c | |
| parent | ad363f80c386bc4701b1bc2cdf08ca9b96a9337b (diff) | |
| download | blackbird-op-linux-5f3b1a8b6737b09ce5df4ec9fad4ad271aecb5fb.tar.gz blackbird-op-linux-5f3b1a8b6737b09ce5df4ec9fad4ad271aecb5fb.zip | |
ACPICA: Remove duplicate table definitions (non-conflicting)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 324b0991943e..15d677e6cee9 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -620,15 +620,16 @@ void __init acpi_early_init(void) #ifdef CONFIG_X86 if (!acpi_ioapic) { - extern acpi_interrupt_flags acpi_sci_flags; + extern u8 acpi_sci_flags; /* compatible (0) means level (3) */ - if (acpi_sci_flags.trigger == 0) - acpi_sci_flags.trigger = 3; - + if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { + acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; + acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; + } /* Set PIC-mode SCI trigger type */ acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, - acpi_sci_flags.trigger); + (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); } else { extern int acpi_sci_override_gsi; /* |
