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/pci/pci.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/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, |