Merge branch 'linux-2.6' into for-linus

[sfrench/cifs-2.6.git] / arch / v850 / kernel / process.c

diff --git a/arch/v850/kernel/process.c b/arch/v850/kernel/process.c
index 621111ddf907deb91c04353f6dcb18771070e497..c4f844c86e50eb3ed97fc72f8210d4639bd540f0 100644 (file)
--- a/arch/v850/kernel/process.c
+++ b/arch/v850/kernel/process.c
@@ -11,7 +11,6 @@
  * Written by Miles Bader <miles@gnu.org>
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -37,7 +36,7 @@ extern void ret_from_fork (void);
 
 
 /* The idle loop.  */
-void default_idle (void)
+static void default_idle (void)
 {
        while (! need_resched ())
                asm ("halt; nop; nop; nop; nop; nop" ::: "cc");