diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-12 02:24:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-12 02:24:49 -0700 |
| commit | f2d816ef30bba85a850166fa3a6404a544f8849f (patch) | |
| tree | 802878a5523d4aed09360034e8cf2c5863d6dba8 /include/linux | |
| parent | 5566c10d86a29929678d626398a59298e90b7a52 (diff) | |
| parent | 7347d800b0ec77f34ae1069adc93312a15ab549e (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 3f2b4949a65e..a6ba538f2d14 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -676,6 +676,12 @@ int pci_request_region(struct pci_dev *, int, char *); void pci_release_region(struct pci_dev *, int); /* drivers/pci/bus.c */ +int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, + unsigned long size, unsigned long align, + unsigned long min, unsigned int type_mask, + void (*alignf)(void *, struct resource *, + unsigned long, unsigned long), + void *alignf_data); void pci_enable_bridges(struct pci_bus *bus); /* New-style probing supporting hot-pluggable devices */ |