aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2005-09-07 01:06:25 -0400
committerTony Luck <tony.luck@intel.com>2005-09-07 17:00:08 -0400
commit697eaad417f9f2e40f62282e8b396208b72990cf (patch)
tree567b9bdf2058ed6ef6107c76e24cdb9d19905d78 /arch/ia64/kernel
parenta52ac87eb249f5e87f43e1a0adeb1a737f4a2b43 (diff)
[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>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r--arch/ia64/kernel/acpi.c2
-rw-r--r--arch/ia64/kernel/iosapic.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 9609f243e5d0..66970d7b6c87 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -575,14 +575,12 @@ acpi_register_gsi (u32 gsi, int edge_level, int active_high_low)
575} 575}
576EXPORT_SYMBOL(acpi_register_gsi); 576EXPORT_SYMBOL(acpi_register_gsi);
577 577
578#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
579void 578void
580acpi_unregister_gsi (u32 gsi) 579acpi_unregister_gsi (u32 gsi)
581{ 580{
582 iosapic_unregister_intr(gsi); 581 iosapic_unregister_intr(gsi);
583} 582}
584EXPORT_SYMBOL(acpi_unregister_gsi); 583EXPORT_SYMBOL(acpi_unregister_gsi);
585#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
586 584
587static int __init 585static int __init
588acpi_parse_fadt (unsigned long phys_addr, unsigned long size) 586acpi_parse_fadt (unsigned long phys_addr, unsigned long size)
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 7936b62f7a2e..c0c3f55b0231 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -776,7 +776,6 @@ again:
776 return vector; 776 return vector;
777} 777}
778 778
779#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
780void 779void
781iosapic_unregister_intr (unsigned int gsi) 780iosapic_unregister_intr (unsigned int gsi)
782{ 781{
@@ -859,7 +858,6 @@ iosapic_unregister_intr (unsigned int gsi)
859 spin_unlock(&iosapic_lock); 858 spin_unlock(&iosapic_lock);
860 spin_unlock_irqrestore(&idesc->lock, flags); 859 spin_unlock_irqrestore(&idesc->lock, flags);
861} 860}
862#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
863 861
864/* 862/*
865 * ACPI calls this when it finds an entry for a platform interrupt. 863 * ACPI calls this when it finds an entry for a platform interrupt.