Minor cleanups - remove CONFIG_ACPI_DEALLOCATE_IRQ
PATCH 2/3 Minor cleanups - remove CONFIG_ACPI_DEALLOCATE_IRQ
The config option 'CONFIG_ACPI_DEALLOCATE_IRQ' is no longer needed. This patch removes it.
Signed-off-by Kenji Kaneshige <[email protected]>
---
arch/ia64/Kconfig | 5 ----- arch/ia64/configs/sn2_defconfig | 1 - arch/ia64/configs/tiger_defconfig | 1 - arch/ia64/configs/zx1_defconfig | 1 - arch/ia64/defconfig | 1 - arch/ia64/kernel/acpi.c | 2 -- arch/ia64/kernel/iosapic.c | 2 -- arch/ia64/pci/pci.c | 2 -- include/asm-ia64/iosapic.h | 2 -- 9 files changed, 17 deletions(-)
arch/ia64/configs/sn2_defconfig renamed from arch/ia64/configs/sn2_defconfig~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -1
@@ -111,7 +111,6 @@ CONFIG_COMPAT=y CONFIG_IA64_MCA_RECOVERY=y CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y -CONFIG_ACPI_DEALLOCATE_IRQ=y # # Firmware Drivers
arch/ia64/configs/tiger_defconfig renamed from arch/ia64/configs/tiger_defconfig~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -1
@@ -109,7 +109,6 @@ CONFIG_COMPAT=y CONFIG_IA64_MCA_RECOVERY=y CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y -CONFIG_ACPI_DEALLOCATE_IRQ=y # # Firmware Drivers
arch/ia64/configs/zx1_defconfig renamed from arch/ia64/configs/zx1_defconfig~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -1
@@ -109,7 +109,6 @@ CONFIG_COMPAT=y CONFIG_IA64_MCA_RECOVERY=y CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y -CONFIG_ACPI_DEALLOCATE_IRQ=y # # Firmware Drivers
arch/ia64/defconfig renamed from arch/ia64/defconfig~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -1
@@ -99,7 +99,6 @@ CONFIG_COMPAT=y CONFIG_IA64_MCA_RECOVERY=y CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y -CONFIG_ACPI_DEALLOCATE_IRQ=y # # Firmware Drivers
arch/ia64/Kconfig renamed from arch/ia64/Kconfig~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -5
@@ -338,11 +338,6 @@ config IA64_PALINFO To use this option, you have to ensure that the "/proc file system support" (CONFIG_PROC_FS) is enabled, too. -config ACPI_DEALLOCATE_IRQ - bool - depends on IOSAPIC && EXPERIMENTAL - default y - source "drivers/firmware/Kconfig" source "fs/Kconfig.binfmt"
arch/ia64/kernel/acpi.c renamed from arch/ia64/kernel/acpi.c~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -2
@@ -575,14 +575,12 @@ acpi_register_gsi (u32 gsi, int edge_lev }EXPORT_SYMBOL (acpi_register_gsi); -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ void acpi_unregister_gsi (u32 gsi) {iosapic_unregister_intr (gsi); }EXPORT_SYMBOL (acpi_unregister_gsi); -#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */ static int __init acpi_parse_fadt (unsigned long phys_addr,unsigned long size)
arch/ia64/kernel/iosapic.c renamed from arch/ia64/kernel/iosapic.c~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -2
@@ -776,7 +776,6 @@ again:return vector; } -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ void iosapic_unregister_intr (unsigned int gsi) {
@@ -859,7 +858,6 @@ iosapic_unregister_intr (unsigned int gsspin_unlock (&iosapic_lock);spin_unlock_irqrestore (&idesc->lock, flags); } -#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */ /* * ACPI calls this when it finds an entry for a platform interrupt.
arch/ia64/pci/pci.c renamed from arch/ia64/pci/pci.c~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -2
@@ -499,13 +499,11 @@ pcibios_enable_device (struct pci_dev *dreturn acpi_pci_irq_enable (dev); } -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ void pcibios_disable_device (struct pci_dev *dev) {acpi_pci_irq_disable (dev); } -#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */ void pcibios_align_resource (void *data, struct resource *res,
include/asm-ia64/iosapic.h renamed from include/asm-ia64/iosapic.h~ia64-cleanup-remove-CONFIG_ACPI_DEALLOCATE_IRQ +0 -2
@@ -83,9 +83,7 @@ extern int gsi_to_irq (unsigned int gsi)extern void iosapic_enable_intr (unsigned int vector);extern int iosapic_register_intr (unsigned int gsi,unsigned long polarity,unsigned long trigger); -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ extern void iosapic_unregister_intr (unsigned int irq); -#endif extern void __init iosapic_override_isa_irq (unsigned int isa_irq,unsigned int gsi,unsigned long polarity,unsigned long trigger);
_