aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/acpi_32.h6
-rw-r--r--include/asm-x86/io_apic_64.h2
-rw-r--r--include/asm-x86/proto.h2
3 files changed, 3 insertions, 7 deletions
diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h
index 125179adf044..723493e6c851 100644
--- a/include/asm-x86/acpi_32.h
+++ b/include/asm-x86/acpi_32.h
@@ -81,11 +81,7 @@ int __acpi_release_global_lock(unsigned int *lock);
81 :"=r"(n_hi), "=r"(n_lo) \ 81 :"=r"(n_hi), "=r"(n_lo) \
82 :"0"(n_hi), "1"(n_lo)) 82 :"0"(n_hi), "1"(n_lo))
83 83
84#ifdef CONFIG_X86_IO_APIC 84extern void early_quirks(void);
85extern void check_acpi_pci(void);
86#else
87static inline void check_acpi_pci(void) { }
88#endif
89 85
90#ifdef CONFIG_ACPI 86#ifdef CONFIG_ACPI
91extern int acpi_lapic; 87extern int acpi_lapic;
diff --git a/include/asm-x86/io_apic_64.h b/include/asm-x86/io_apic_64.h
index d9f2e54324d5..e2c13675ee4e 100644
--- a/include/asm-x86/io_apic_64.h
+++ b/include/asm-x86/io_apic_64.h
@@ -133,4 +133,6 @@ void enable_NMI_through_LVT0 (void * dummy);
133 133
134extern spinlock_t i8259A_lock; 134extern spinlock_t i8259A_lock;
135 135
136extern int timer_over_8254;
137
136#endif 138#endif
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index c44a3a93b5a4..dabba55f7ed8 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -83,8 +83,6 @@ extern unsigned tsc_khz;
83extern int reboot_force; 83extern int reboot_force;
84extern int notsc_setup(char *); 84extern int notsc_setup(char *);
85 85
86extern int timer_over_8254;
87
88extern int gsi_irq_sharing(int gsi); 86extern int gsi_irq_sharing(int gsi);
89 87
90extern int force_mwait; 88extern int force_mwait;