diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /arch/ia64/kernel/acpi.c | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index ef2fe474f107..29f05d4b68cd 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -609,6 +609,9 @@ EXPORT_SYMBOL(acpi_register_gsi); | |||
| 609 | 609 | ||
| 610 | void acpi_unregister_gsi(u32 gsi) | 610 | void acpi_unregister_gsi(u32 gsi) |
| 611 | { | 611 | { |
| 612 | if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) | ||
| 613 | return; | ||
| 614 | |||
| 612 | iosapic_unregister_intr(gsi); | 615 | iosapic_unregister_intr(gsi); |
| 613 | } | 616 | } |
| 614 | 617 | ||