git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
cris
/
kernel
/
process.c
diff --git
a/arch/cris/kernel/process.c
b/arch/cris/kernel/process.c
index
4ab3e87
..
123451c
100644
(file)
--- a/
arch/cris/kernel/process.c
+++ b/
arch/cris/kernel/process.c
@@
-116,6
+116,7
@@
#include <asm/pgtable.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/fs_struct.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/fs_struct.h>
@@
-194,8
+195,6
@@
EXPORT_SYMBOL(enable_hlt);
*/
void (*pm_idle)(void);
*/
void (*pm_idle)(void);
-extern void default_idle(void);
-
/*
* The idle thread. There's no useful work to be
* done, so just try to conserve power and have a
/*
* The idle thread. There's no useful work to be
* done, so just try to conserve power and have a