git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../torvalds-2.6/
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
r4k_switch.S
diff --git
a/arch/mips/kernel/r4k_switch.S
b/arch/mips/kernel/r4k_switch.S
index e02b7722ccb8d1753e073bf85eb08b18849f7f8f..d2afbd19a9c8a0c013b4170008d55a18d701e61c 100644
(file)
--- a/
arch/mips/kernel/r4k_switch.S
+++ b/
arch/mips/kernel/r4k_switch.S
@@
-15,7
+15,7
@@
#include <asm/cachectl.h>
#include <asm/fpregdef.h>
#include <asm/mipsregs.h>
-#include <asm/
offset
.h>
+#include <asm/
asm-offsets
.h>
#include <asm/page.h>
#include <asm/pgtable-bits.h>
#include <asm/regdef.h>