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.

arch/ia64/pci/pci.c

+2 −2

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