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 /drivers/s390/char | |
| 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 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/vmwatchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index 5473c23fcb5..5acc0ace3d7 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c | |||
| @@ -66,7 +66,7 @@ static int __diag288(enum vmwdt_func func, unsigned int timeout, | |||
| 66 | __cmdl = len; | 66 | __cmdl = len; |
| 67 | err = 0; | 67 | err = 0; |
| 68 | asm volatile ( | 68 | asm volatile ( |
| 69 | #ifdef __s390x__ | 69 | #ifdef CONFIG_64BIT |
| 70 | "diag %2,%4,0x288\n" | 70 | "diag %2,%4,0x288\n" |
| 71 | "1: \n" | 71 | "1: \n" |
| 72 | ".section .fixup,\"ax\"\n" | 72 | ".section .fixup,\"ax\"\n" |