git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpuidle into release branch
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
traps.c
diff --git
a/arch/cris/arch-v32/kernel/traps.c
b/arch/cris/arch-v32/kernel/traps.c
index
6e37870
..
17fd3db
100644
(file)
--- a/
arch/cris/arch-v32/kernel/traps.c
+++ b/
arch/cris/arch-v32/kernel/traps.c
@@
-2,7
+2,6
@@
* Copyright (C) 2003, Axis Communications AB.
*/
* Copyright (C) 2003, Axis Communications AB.
*/
-#include <linux/config.h>
#include <linux/ptrace.h>
#include <asm/uaccess.h>
#include <linux/ptrace.h>
#include <asm/uaccess.h>
@@
-106,7
+105,7
@@
bad_value:
/*
* This gets called from entry.S when the watchdog has bitten. Show something
/*
* This gets called from entry.S when the watchdog has bitten. Show something
- * simil
iar to an Oops dump, and if the kernel if
configured to be a nice doggy;
+ * simil
ar to an Oops dump, and if the kernel is
configured to be a nice doggy;
* halt instead of reboot.
*/
void
* halt instead of reboot.
*/
void