diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:26:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:26:52 -0400 |
| commit | 4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648 (patch) | |
| tree | 9dc3fc8276d987058cd8f3826113c5baa2a1b595 /arch/ia64/kernel/iosapic.c | |
| parent | 529980c8b0b04e8a3f6606cdc156f1f81a5d68cd (diff) | |
| parent | 344a076110f4ecb16ea6d286b63be696604982ed (diff) | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/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. |