===== arch/i386/kernel/acpi/boot.c 1.62 vs edited =====
--- 1.62/arch/i386/kernel/acpi/boot.c	Sun May 16 05:32:44 2004
+++ edited/arch/i386/kernel/acpi/boot.c	Wed Jun 23 18:42:52 2004
@@ -396,7 +396,7 @@
  * ECLR2 is IRQ's 8-15 (IRQ 8, 13 must be 0)
  */
 
-void __init
+void
 acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
 {
 	unsigned char mask = 1 << (irq & 7);
===== drivers/acpi/bus.c 1.42 vs edited =====
--- 1.42/drivers/acpi/bus.c	Wed May 12 12:36:55 2004
+++ edited/drivers/acpi/bus.c	Wed Jun 23 18:41:32 2004
@@ -40,7 +40,7 @@
 ACPI_MODULE_NAME		("acpi_bus")
 
 #ifdef	CONFIG_X86
-extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
+extern void acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
 #endif
 
 FADT_DESCRIPTOR			acpi_fadt;
===== drivers/acpi/sleep/main.c 1.36 vs edited =====
--- 1.36/drivers/acpi/sleep/main.c	Tue Sep 30 09:06:33 2003
+++ edited/drivers/acpi/sleep/main.c	Wed Jun 23 18:40:22 2004
@@ -142,6 +142,17 @@
 		printk("Broken toshiba laptop -> kicking interrupts\n");
 		init_8259A(0);
 	}
+
+#ifdef CONFIG_X86
+	if (!acpi_ioapic) {
+		extern acpi_interrupt_flags acpi_sci_flags;
+		extern void acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
+
+		/* Set PIC-mode SCI trigger type */
+		acpi_pic_sci_set_trigger(acpi_fadt.sci_int, acpi_sci_flags.trigger);
+	}
+#endif
+
 	return 0;
 }