diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-01-06 03:19:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:53 -0500 |
| commit | 347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1 (patch) | |
| tree | a6ec76690127e87fe6efa42b6238caadd6c07e7b /arch/s390/kernel/head.S | |
| parent | 9bbc8346fb21fad3f678220b067450e436e45dbf (diff) | |
[PATCH] s390: cleanup Kconfig
Sanitize some s390 Kconfig options. We have ARCH_S390, ARCH_S390X,
ARCH_S390_31, 64BIT, S390_SUPPORT and COMPAT. Replace these 6 options by
S390, 64BIT and COMPAT.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/s390/kernel/head.S')
| -rw-r--r-- | arch/s390/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index d31a97c89f68..ea88d066bf04 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <asm/thread_info.h> | 30 | #include <asm/thread_info.h> |
| 31 | #include <asm/page.h> | 31 | #include <asm/page.h> |
| 32 | 32 | ||
| 33 | #ifdef CONFIG_ARCH_S390X | 33 | #ifdef CONFIG_64BIT |
| 34 | #define ARCH_OFFSET 4 | 34 | #define ARCH_OFFSET 4 |
| 35 | #else | 35 | #else |
| 36 | #define ARCH_OFFSET 0 | 36 | #define ARCH_OFFSET 0 |
| @@ -539,7 +539,7 @@ ipl_devno: | |||
| 539 | .word 0 | 539 | .word 0 |
| 540 | .endm | 540 | .endm |
| 541 | 541 | ||
| 542 | #ifdef CONFIG_ARCH_S390X | 542 | #ifdef CONFIG_64BIT |
| 543 | #include "head64.S" | 543 | #include "head64.S" |
| 544 | #else | 544 | #else |
| 545 | #include "head31.S" | 545 | #include "head31.S" |