projects
/
cascardo
/
linux.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/jejb/scsi-for-linus-2.6
[cascardo/linux.git]
/
arch
/
ppc64
/
kernel
/
entry.S
diff --git
a/arch/ppc64/kernel/entry.S
b/arch/ppc64/kernel/entry.S
index
bf99b4a
..
d133a49
100644
(file)
--- a/
arch/ppc64/kernel/entry.S
+++ b/
arch/ppc64/kernel/entry.S
@@
-28,7
+28,7
@@
#include <asm/mmu.h>
#include <asm/thread_info.h>
#include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/
asm-
offsets.h>
#include <asm/cputable.h>
#ifdef CONFIG_PPC_ISERIES