---

yaml --- r: 114652 b: refs/heads/master c: cd301c7 h: refs/heads/master v: v3
git-mirror · Oct 13, 2008 · d0928d0 · d0928d0
1 parent 1cba234
commit d0928d0
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: 8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61
+refs/heads/master: cd301c7ba4bbb5a0ee6ebf13eb4a304f29b13847
diff --git a/trunk/arch/powerpc/kernel/setup_32.c b/trunk/arch/powerpc/kernel/setup_32.c
@@ -111,7 +111,7 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)
  * This is called very early on the boot process, after a minimal
  * MMU environment has been set up but before MMU_init is called.
  */
-notrace void __init machine_init(unsigned long dt_ptr, unsigned long phys)
+notrace void __init machine_init(unsigned long dt_ptr)
 {
 	/* Enable early debugging if any specified (see udbg.h) */
 	udbg_early_init();