diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-01-06 00:19:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 08:33:53 -0800 |
| commit | 347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1 (patch) | |
| tree | a6ec76690127e87fe6efa42b6238caadd6c07e7b /fs | |
| parent | 9bbc8346fb21fad3f678220b067450e436e45dbf (diff) | |
| download | blackbird-op-linux-347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1.tar.gz blackbird-op-linux-347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1.zip | |
[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 'fs')
| -rw-r--r-- | fs/partitions/Kconfig | 2 | ||||
| -rw-r--r-- | fs/proc/array.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig index 656bc43431b9..e227a04261ab 100644 --- a/fs/partitions/Kconfig +++ b/fs/partitions/Kconfig @@ -85,7 +85,7 @@ config ATARI_PARTITION config IBM_PARTITION bool "IBM disk label and partition support" - depends on PARTITION_ADVANCED && ARCH_S390 + depends on PARTITION_ADVANCED && S390 help Say Y here if you would like to be able to read the hard disk partition table format used by IBM DASD disks operating under CMS. diff --git a/fs/proc/array.c b/fs/proc/array.c index 3e1239e4b303..5e9251f65317 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -308,7 +308,7 @@ int proc_pid_status(struct task_struct *task, char * buffer) buffer = task_sig(task, buffer); buffer = task_cap(task, buffer); buffer = cpuset_task_status_allowed(task, buffer); -#if defined(CONFIG_ARCH_S390) +#if defined(CONFIG_S390) buffer = task_show_regs(task, buffer); #endif return buffer - orig; |
