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
[GFS2] Fix up merge of Linus' kernel into GFS2
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
process.c
diff --git
a/arch/sh/kernel/process.c
b/arch/sh/kernel/process.c
index
9fd1723
..
f203131
100644
(file)
--- a/
arch/sh/kernel/process.c
+++ b/
arch/sh/kernel/process.c
@@
-19,7
+19,6
@@
#include <linux/slab.h>
#include <linux/pm.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/pm.h>
#include <linux/ptrace.h>
-#include <linux/platform.h>
#include <linux/kallsyms.h>
#include <linux/kexec.h>
#include <linux/kallsyms.h>
#include <linux/kexec.h>
@@
-27,6
+26,7
@@
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/elf.h>
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/elf.h>
+#include <asm/ubc.h>
static int hlt_counter=0;
static int hlt_counter=0;