Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

This commit is contained in:
Linus Torvalds 2005-09-08 15:55:23 -07:00
commit 7bbedd5213
61 changed files with 1299 additions and 12082 deletions

View file

@ -269,6 +269,8 @@ extern void
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
struct pci_bus_region *region);
extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *);
static inline void pcibios_add_platform_entries(struct pci_dev *dev)
{
}