diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-03-12 19:21:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-03-12 19:21:11 -0800 |
| commit | d079f5802fe009c3b254a9a8db1fbb0d77e920a0 (patch) | |
| tree | dab33e9cb04986a8ad55ccb7ff06ffc21c223c73 /include/linux | |
| parent | 78ca401062ab6c1bb28be922437143969e309c99 (diff) | |
| parent | 73e567edc0e62817ce60b84a561caa29dd40e1ac (diff) | |
Merge http://gkernel.bkbits.net/misc-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 074049025ea9..6376381a6533 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -567,7 +567,6 @@ void pci_set_master(struct pci_dev *dev); #define HAVE_PCI_SET_MWI int pci_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); -int pdev_set_mwi(struct pci_dev *dev); int pci_set_dma_mask(struct pci_dev *dev, u64 mask); int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask); int pci_assign_resource(struct pci_dev *dev, int i); |