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 master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
[sfrench/cifs-2.6.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
entry.S
diff --git
a/arch/cris/arch-v32/kernel/entry.S
b/arch/cris/arch-v32/kernel/entry.S
index a8ed55e5b4031c09b93601db60c323ccfe1c9a24..3bd8503fec6842420ed7cf01d105fcd7b9f87e97 100644
(file)
--- a/
arch/cris/arch-v32/kernel/entry.S
+++ b/
arch/cris/arch-v32/kernel/entry.S
@@
-23,7
+23,7
@@
#include <asm/unistd.h>
#include <asm/errno.h>
#include <asm/thread_info.h>
-#include <asm/a
rch/offset
.h>
+#include <asm/a
sm-offsets
.h>
#include <asm/arch/hwregs/asm/reg_map_asm.h>
#include <asm/arch/hwregs/asm/intr_vect_defs_asm.h>