git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[safe/jmp/linux-2.6]
/
include
/
linux
/
pci.h
diff --git
a/include/linux/pci.h
b/include/linux/pci.h
index
9c7aecf
..
e5e24e1
100644
(file)
--- a/
include/linux/pci.h
+++ b/
include/linux/pci.h
@@
-329,6
+329,7
@@
extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
extern void pci_dev_put(struct pci_dev *dev);
extern void pci_remove_bus(struct pci_bus *b);
extern void pci_remove_bus_device(struct pci_dev *dev);
+void pci_setup_cardbus(struct pci_bus *bus);
/* Generic PCI functions exported to card drivers */