Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix pci.c kernel compilation breakage.
This commit is contained in:
Linus Torvalds 2006-12-06 16:16:35 -08:00
commit 9232d5876e

View file

@ -564,8 +564,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
void
pcibios_disable_device (struct pci_dev *dev)
{
if (dev->is_enabled)
acpi_pci_irq_disable(dev);
BUG_ON(atomic_read(&dev->enable_cnt));
acpi_pci_irq_disable(dev);
}
void