[ACPI] fix !CONFIG_PCI build (Bjorn Helgaas)

arch/i386/kernel/acpi/boot.c

@@ -437,23 +437,25 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 	return 0;
 }
 
-#ifdef CONFIG_ACPI_PCI
 unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
 {
-	static u16 irq_mask;
 	unsigned int irq;
-	extern void eisa_set_level_irq(unsigned int irq);
 
+#ifdef CONFIG_PCI
 	/*
 	 * Make sure all (legacy) PCI IRQs are set as level-triggered.
 	 */
 	if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
+		static u16 irq_mask;
+		extern void eisa_set_level_irq(unsigned int irq);
+
 		if ((gsi < 16) && !((1 << gsi) & irq_mask)) {
 			Dprintk(KERN_DEBUG PREFIX "Setting GSI %u as level-triggered\n", gsi);
 			irq_mask |= (1 << gsi);
 			eisa_set_level_irq(gsi);
 		}
 	}
+#endif
 
 #ifdef CONFIG_X86_IO_APIC
 	if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
@@ -463,7 +465,6 @@ unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
 	acpi_gsi_to_irq(gsi, &irq);
 	return irq;
 }
-#endif	/* CONFIG_ACPI_PCI */
 
 static unsigned long __init
 acpi_scan_rsdp (

include/linux/acpi.h

@@ -413,6 +413,8 @@ static inline int acpi_boot_init(void)
 
 #endif 	/*!CONFIG_ACPI_BOOT*/
 
+unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
+int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
 
 #ifdef CONFIG_ACPI_PCI
 
@@ -437,8 +439,6 @@ extern struct acpi_prt_list	acpi_prt;
 struct pci_dev;
 
 int acpi_pci_irq_enable (struct pci_dev *dev);
-unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
-int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
 
 struct acpi_pci_driver {
 	struct acpi_pci_driver *next;