commit de542925fbf179fb4b39bab2c3235b4525f96794
author Linus Torvalds <torvalds@g5.osdl.org> Mon Apr 17 17:44:17 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Apr 17 17:44:17 2006 -0700
tree 11b0f8baf2469c52405ab9be9f82c414c3de64b4
parent 5fdfd42e3a69e8a686fcfb6381616464945471e8
parent b78b6af66a5fbaf17d7e6bfc32384df5e34408c8

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/stable-2.6:
  [PATCH] shmat: stop mprotect from giving write permission to a readonly attachment (CVE-2006-1524)
  [PATCH] cciss: bug fix for crash when running hpacucli
  [PATCH] ext3: Fix missed mutex unlock
  [PATCH] Fix block device symlink name
  [PATCH] isd200: limit to BLK_DEV_IDE

arch/sparc64/kernel/pci.c

diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index dfccff2..f97ddeb 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -419,6 +419,7 @@
 	region->start = res->start - zero_res.start;
 	region->end = res->end - zero_res.start;
 }
+EXPORT_SYMBOL(pcibios_resource_to_bus);
 
 void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res,
 			     struct pci_bus_region *region)