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
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
sparc
/
mm
/
hypersparc.S
diff --git
a/arch/sparc/mm/hypersparc.S
b/arch/sparc/mm/hypersparc.S
index
54b8e76
..
a231cca
100644
(file)
--- a/
arch/sparc/mm/hypersparc.S
+++ b/
arch/sparc/mm/hypersparc.S
@@
-6,7
+6,7
@@
#include <asm/ptrace.h>
#include <asm/psr.h>
-#include <asm/asm
_
offsets.h>
+#include <asm/asm
-
offsets.h>
#include <asm/asi.h>
#include <asm/page.h>
#include <asm/pgtsrmmu.h>