diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
| commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
| tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /arch/ia64 | |
| parent | d0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff) | |
| parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) | |
Merge HEAD from ../from-linus
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/pci/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 54d9ed444e4a..f9472c50ab42 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -380,6 +380,7 @@ void pcibios_bus_to_resource(struct pci_dev *dev, | |||
| 380 | res->start = region->start + offset; | 380 | res->start = region->start + offset; |
| 381 | res->end = region->end + offset; | 381 | res->end = region->end + offset; |
| 382 | } | 382 | } |
| 383 | EXPORT_SYMBOL(pcibios_bus_to_resource); | ||
| 383 | 384 | ||
| 384 | static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | 385 | static int __devinit is_valid_resource(struct pci_dev *dev, int idx) |
| 385 | { | 386 | { |