aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r--drivers/acpi/bus.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 8b0d4b7d188a..ce3c0a2cbac4 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -31,6 +31,7 @@
31#include <linux/pm.h> 31#include <linux/pm.h>
32#include <linux/device.h> 32#include <linux/device.h>
33#include <linux/proc_fs.h> 33#include <linux/proc_fs.h>
34#include <linux/acpi.h>
34#ifdef CONFIG_X86 35#ifdef CONFIG_X86
35#include <asm/mpspec.h> 36#include <asm/mpspec.h>
36#endif 37#endif
@@ -39,9 +40,6 @@
39 40
40#define _COMPONENT ACPI_BUS_COMPONENT 41#define _COMPONENT ACPI_BUS_COMPONENT
41ACPI_MODULE_NAME("bus"); 42ACPI_MODULE_NAME("bus");
42#ifdef CONFIG_X86
43extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
44#endif
45 43
46struct acpi_device *acpi_root; 44struct acpi_device *acpi_root;
47struct proc_dir_entry *acpi_root_dir; 45struct proc_dir_entry *acpi_root_dir;
@@ -653,8 +651,6 @@ void __init acpi_early_init(void)
653 651
654#ifdef CONFIG_X86 652#ifdef CONFIG_X86
655 if (!acpi_ioapic) { 653 if (!acpi_ioapic) {
656 extern u8 acpi_sci_flags;
657
658 /* compatible (0) means level (3) */ 654 /* compatible (0) means level (3) */
659 if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { 655 if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) {
660 acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; 656 acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK;
@@ -664,7 +660,6 @@ void __init acpi_early_init(void)
664 acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, 660 acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt,
665 (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); 661 (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2);
666 } else { 662 } else {
667 extern int acpi_sci_override_gsi;
668 /* 663 /*
669 * now that acpi_gbl_FADT is initialized, 664 * now that acpi_gbl_FADT is initialized,
670 * update it with result from INT_SRC_OVR parsing 665 * update it with result from INT_SRC_OVR parsing