diff options
| author | Jens Axboe <axboe@suse.de> | 2002-09-09 19:11:10 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@burns.home.kernel.dk> | 2002-09-09 19:11:10 -0700 |
| commit | e47901f91ab84c6cb515f245e3eef1660f3fd978 (patch) | |
| tree | fabdb2ad589af19a7be350d55a9ad8a8f2443291 /include/linux | |
| parent | ac9c060c62f003f2f5ea79ef8c46b317438824cc (diff) | |
[PATCH] PCI individual resource handling
This merges the changes from 2.4-ac that allow drivers to enable (and
mark as used) only a subset of PCI resources, for those drivers that
need it (at this point apparently only the i845 IDE controller).
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 79d909a8643a..ba2e997304fd 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -507,7 +507,7 @@ struct pci_driver { for(dev = pci_dev_g(pci_devices.next); dev != pci_dev_g(&pci_devices); dev = pci_dev_g(dev->global_list.next)) void pcibios_fixup_bus(struct pci_bus *); -int pcibios_enable_device(struct pci_dev *); +int pcibios_enable_device(struct pci_dev *, int mask); char *pcibios_setup (char *str); /* Used only when drivers/pci/setup.c is used */ @@ -600,6 +600,7 @@ static int inline pci_write_config_dword(struct pci_dev *dev, int where, u32 val extern spinlock_t pci_lock; int pci_enable_device(struct pci_dev *dev); +int pci_enable_device_bars(struct pci_dev *dev, int mask); void pci_disable_device(struct pci_dev *dev); void pci_set_master(struct pci_dev *dev); #define HAVE_PCI_SET_MWI @@ -623,9 +624,11 @@ void pdev_enable_device(struct pci_dev *); void pdev_sort_resources(struct pci_dev *, struct resource_list *); void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), int (*)(struct pci_dev *, u8, u8)); -#define HAVE_PCI_REQ_REGIONS +#define HAVE_PCI_REQ_REGIONS 2 int pci_request_regions(struct pci_dev *, char *); void pci_release_regions(struct pci_dev *); +int pci_request_region(struct pci_dev *, int, char *); +void pci_release_region(struct pci_dev *, int); /* New-style probing supporting hot-pluggable devices */ int pci_register_driver(struct pci_driver *); |