aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/pci/common.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-30 13:15:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-30 13:15:57 -0400
commit6d1d07e41a1de478a0da3cc14b4a8054ef09931c (patch)
treedb7802272fd8aff185a6ecc29ea78c1e3005783b /arch/i386/pci/common.c
parentd7a465b4740806e4ee34061ad455595b2fa9fad5 (diff)
parentadbedd34244e2b054557002817f979a9b004a405 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
Diffstat (limited to 'arch/i386/pci/common.c')
-rw-r--r--arch/i386/pci/common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index 70bcd53451f6..ade5bc57c34c 100644
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -254,3 +254,9 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
254 254
255 return pcibios_enable_irq(dev); 255 return pcibios_enable_irq(dev);
256} 256}
257
258void pcibios_disable_device (struct pci_dev *dev)
259{
260 if (pcibios_disable_irq)
261 pcibios_disable_irq(dev);
262}