mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
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:
commit
9232d5876e
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue