---

yaml --- r: 167623 b: refs/heads/master c: 0f6023d h: refs/heads/master i: 167621: cda09e6 167619: d08e40d 167615: 13ee961 v: v3
git-mirror · Oct 14, 2009 · e40535c · e40535c
1 parent 2b8be4d
commit e40535c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04f5653477a245379da9fa57dd7d1b4b75dd4b0b
+refs/heads/master: 0f6023d5997bf1b5eeae39de42a7e1e26dbe6a90
diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c
@@ -1190,7 +1190,7 @@ EXPORT_SYMBOL(pcibios_align_resource);
  * Reparent resource children of pr that conflict with res
  * under res, and make res replace those children.
  */
-static int __init reparent_resources(struct resource *parent,
+static int reparent_resources(struct resource *parent,
 				     struct resource *res)
 {
 	struct resource *p, **pp;