diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
| commit | 34161db6b14d984fb9b06c735b7b42f8803f6851 (patch) | |
| tree | 99656278b6697f1cde5b05894b7c0ee22c63a00e /arch/ia64/pci | |
| parent | 5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Conflicts:
include/linux/sunrpc/xprt.h
net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
Diffstat (limited to 'arch/ia64/pci')
| -rw-r--r-- | arch/ia64/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index f4edfbf27134..eb92cef9cd0d 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -564,8 +564,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask) | |||
| 564 | void | 564 | void |
| 565 | pcibios_disable_device (struct pci_dev *dev) | 565 | pcibios_disable_device (struct pci_dev *dev) |
| 566 | { | 566 | { |
| 567 | if (dev->is_enabled) | 567 | BUG_ON(atomic_read(&dev->enable_cnt)); |
| 568 | acpi_pci_irq_disable(dev); | 568 | acpi_pci_irq_disable(dev); |
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | void | 571 | void |