Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / arch / v850 / kernel / process.c

diff --git a/arch/v850/kernel/process.c b/arch/v850/kernel/process.c
index eb909937958bcd5ba44c1a02121910ba63a7cd82..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>
@@ -30,11 +29,14 @@
 #include <asm/system.h>
 #include <asm/pgtable.h>
 
+void (*pm_power_off)(void) = NULL;
+EXPORT_SYMBOL(pm_power_off);
+
 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");