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
/
s390
/
kernel
/
head.S
diff --git
a/arch/s390/kernel/head.S
b/arch/s390/kernel/head.S
index
2710e66
..
55654b6
100644
(file)
--- a/
arch/s390/kernel/head.S
+++ b/
arch/s390/kernel/head.S
@@
-30,7
+30,7
@@
#include <linux/config.h>
#include <asm/setup.h>
#include <asm/lowcore.h>
-#include <asm/offsets.h>
+#include <asm/
asm-
offsets.h>
#include <asm/thread_info.h>
#include <asm/page.h>