diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /drivers/pci/setup-bus.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 6b0e6464eb39..657be948baf7 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -77,8 +77,7 @@ pbus_assign_resources_sorted(struct pci_bus *bus) | |||
| 77 | } | 77 | } |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | static void __devinit | 80 | void pci_setup_cardbus(struct pci_bus *bus) |
| 81 | pci_setup_cardbus(struct pci_bus *bus) | ||
| 82 | { | 81 | { |
| 83 | struct pci_dev *bridge = bus->self; | 82 | struct pci_dev *bridge = bus->self; |
| 84 | struct pci_bus_region region; | 83 | struct pci_bus_region region; |
| @@ -130,6 +129,7 @@ pci_setup_cardbus(struct pci_bus *bus) | |||
| 130 | region.end); | 129 | region.end); |
| 131 | } | 130 | } |
| 132 | } | 131 | } |
| 132 | EXPORT_SYMBOL(pci_setup_cardbus); | ||
| 133 | 133 | ||
| 134 | /* Initialize bridges with base/limit values we have collected. | 134 | /* Initialize bridges with base/limit values we have collected. |
| 135 | PCI-to-PCI Bridge Architecture Specification rev. 1.1 (1998) | 135 | PCI-to-PCI Bridge Architecture Specification rev. 1.1 (1998) |