X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-i386%2Facpi.h;h=55059abf9c95820d2569efa62879fb7bd76d238d;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=20f52395421877301bdcc0203d4095dc378c8563;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 20f523954..55059abf9 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -103,12 +103,6 @@ __acpi_release_global_lock (unsigned int *lock) :"=r"(n_hi), "=r"(n_lo) \ :"0"(n_hi), "1"(n_lo)) -#ifdef CONFIG_X86_IO_APIC -extern void check_acpi_pci(void); -#else -static inline void check_acpi_pci(void) { } -#endif - #ifdef CONFIG_ACPI extern int acpi_lapic; extern int acpi_ioapic; @@ -134,6 +128,8 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); extern int skip_ioapic_setup; extern int acpi_skip_timer_override; +extern void check_acpi_pci(void); + static inline void disable_ioapic_setup(void) { skip_ioapic_setup = 1; @@ -146,6 +142,8 @@ static inline int ioapic_setup_disabled(void) #else static inline void disable_ioapic_setup(void) { } +static inline void check_acpi_pci(void) { } + #endif static inline void acpi_noirq_set(void) { acpi_noirq = 1; }