diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 22:19:05 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 22:19:05 (GMT) |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/s390/kernel/base.S | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
| download | linux-fsl-qoriq-d702d12167a2c05a346f49aac7a311d597762495.tar.xz | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/s390/kernel/base.S')
| -rw-r--r-- | arch/s390/kernel/base.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/base.S b/arch/s390/kernel/base.S index dc7e525..15e46ca 100644 --- a/arch/s390/kernel/base.S +++ b/arch/s390/kernel/base.S @@ -6,8 +6,8 @@ * Michael Holzheu <holzheu@de.ibm.com> */ +#include <asm/asm-offsets.h> #include <asm/ptrace.h> -#include <asm/lowcore.h> #ifdef CONFIG_64BIT |