diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /arch/ia64/kernel/iosapic.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/iosapic.c')
| -rw-r--r-- | arch/ia64/kernel/iosapic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index a13df592ebf7..574084f343fa 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
| @@ -782,7 +782,6 @@ again: | |||
| 782 | return vector; | 782 | return vector; |
| 783 | } | 783 | } |
| 784 | 784 | ||
| 785 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ | ||
| 786 | void | 785 | void |
| 787 | iosapic_unregister_intr (unsigned int gsi) | 786 | iosapic_unregister_intr (unsigned int gsi) |
| 788 | { | 787 | { |
| @@ -865,7 +864,6 @@ iosapic_unregister_intr (unsigned int gsi) | |||
| 865 | spin_unlock(&iosapic_lock); | 864 | spin_unlock(&iosapic_lock); |
| 866 | spin_unlock_irqrestore(&idesc->lock, flags); | 865 | spin_unlock_irqrestore(&idesc->lock, flags); |
| 867 | } | 866 | } |
| 868 | #endif /* CONFIG_ACPI_DEALLOCATE_IRQ */ | ||
| 869 | 867 | ||
| 870 | /* | 868 | /* |
| 871 | * ACPI calls this when it finds an entry for a platform interrupt. | 869 | * ACPI calls this when it finds an entry for a platform interrupt. |