From d0928d00e1aae2528e4a3cd0008b06e0e5bc4c4c Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Sun, 12 Oct 2008 04:08:14 +0000 Subject: [PATCH] --- yaml --- r: 114652 b: refs/heads/master c: cd301c7ba4bbb5a0ee6ebf13eb4a304f29b13847 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/setup_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9216e769e425..e221f4b3725a 100644 --- 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 index 1e0df1658d3f..c1a27626a940 100644 --- 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();