commit 5f3b1a8b6737b09ce5df4ec9fad4ad271aecb5fb
author Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Fri Feb 02 19:48:22 2007 +0300
committer Len Brown <len.brown@intel.com> Fri Feb 02 21:14:29 2007 -0500
tree 5b3e343ab0c4c963f681afc2bfbba815b26e045b
parent ad363f80c386bc4701b1bc2cdf08ca9b96a9337b

ACPICA: Remove duplicate table definitions (non-conflicting)

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/bus.c

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 324b099..15d677e 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -620,15 +620,16 @@
 
 #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;
 		/*