forked from Minki/linux
[IA64] 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 <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
parent
a52ac87eb2
commit
697eaad417
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -575,14 +575,12 @@ acpi_register_gsi (u32 gsi, int edge_level, int active_high_low)
|
||||
}
|
||||
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)
|
||||
|
@ -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 gsi)
|
||||
spin_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.
|
||||
|
@ -498,13 +498,11 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
|
||||
return 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,
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user