diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/ia64/pci/pci.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 9977c122e9fa..9b5de589b82f 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -498,13 +498,11 @@ pcibios_enable_device (struct pci_dev *dev, int mask) | |||
| 498 | return acpi_pci_irq_enable(dev); | 498 | return acpi_pci_irq_enable(dev); |
| 499 | } | 499 | } |
| 500 | 500 | ||
| 501 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ | ||
| 502 | void | 501 | void |
| 503 | pcibios_disable_device (struct pci_dev *dev) | 502 | pcibios_disable_device (struct pci_dev *dev) |
| 504 | { | 503 | { |
| 505 | acpi_pci_irq_disable(dev); | 504 | acpi_pci_irq_disable(dev); |
| 506 | } | 505 | } |
| 507 | #endif /* CONFIG_ACPI_DEALLOCATE_IRQ */ | ||
| 508 | 506 | ||
| 509 | void | 507 | void |
| 510 | pcibios_align_resource (void *data, struct resource *res, | 508 | pcibios_align_resource (void *data, struct resource *res, |