Commit 9232d587 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents 2fdb611d c7f570a5
......@@ -564,7 +564,7 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
void
pcibios_disable_device (struct pci_dev *dev)
{
if (dev->is_enabled)
BUG_ON(atomic_read(&dev->enable_cnt));
acpi_pci_irq_disable(dev);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment