diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /drivers/pci/setup-res.c | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pci/setup-res.c')
| -rw-r--r-- | drivers/pci/setup-res.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index cb4ced3560e9..6dfd86167e39 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
| @@ -101,8 +101,7 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) | |||
| 101 | new & ~PCI_REGION_FLAG_MASK); | 101 | new & ~PCI_REGION_FLAG_MASK); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | int __devinit | 104 | int pci_claim_resource(struct pci_dev *dev, int resource) |
| 105 | pci_claim_resource(struct pci_dev *dev, int resource) | ||
| 106 | { | 105 | { |
| 107 | struct resource *res = &dev->resource[resource]; | 106 | struct resource *res = &dev->resource[resource]; |
| 108 | struct resource *root = NULL; | 107 | struct resource *root = NULL; |
| @@ -212,8 +211,7 @@ EXPORT_SYMBOL_GPL(pci_assign_resource_fixed); | |||
| 212 | #endif | 211 | #endif |
| 213 | 212 | ||
| 214 | /* Sort resources by alignment */ | 213 | /* Sort resources by alignment */ |
| 215 | void __devinit | 214 | void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head) |
| 216 | pdev_sort_resources(struct pci_dev *dev, struct resource_list *head) | ||
| 217 | { | 215 | { |
| 218 | int i; | 216 | int i; |
| 219 | 217 | ||