# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.588   -> 1.589  
#	arch/s390x/defconfig	1.9     -> 1.10   
#	arch/s390x/config.in	1.10    -> 1.11   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/28	thockin@freakshow.cobalt.com	1.589
# S390x: make CONFIG_UID16 depend on legacy CONFIG_S390_SUPPORT
# --------------------------------------------
#
diff -Nru a/arch/s390x/config.in b/arch/s390x/config.in
--- a/arch/s390x/config.in	Wed Aug 28 17:22:30 2002
+++ b/arch/s390x/config.in	Wed Aug 28 17:22:30 2002
@@ -13,7 +13,6 @@
 mainmenu_name "Linux Kernel Configuration"
 define_bool CONFIG_ARCH_S390 y
 define_bool CONFIG_ARCH_S390X y
-define_bool CONFIG_UID16 y
 
 mainmenu_option next_comment
 comment 'Code maturity level options'
@@ -25,6 +24,7 @@
 bool 'Symmetric multi-processing support' CONFIG_SMP
 bool 'Kernel support for 31 bit emulation' CONFIG_S390_SUPPORT
 if [ "$CONFIG_S390_SUPPORT" = "y" ]; then
+  define_bool CONFIG_UID16 y
   tristate 'Kernel support for 31 bit ELF binaries' CONFIG_BINFMT_ELF32 
 fi
 endmenu
diff -Nru a/arch/s390x/defconfig b/arch/s390x/defconfig
--- a/arch/s390x/defconfig	Wed Aug 28 17:22:30 2002
+++ b/arch/s390x/defconfig	Wed Aug 28 17:22:30 2002
@@ -9,7 +9,6 @@
 # CONFIG_GENERIC_BUST_SPINLOCK is not set
 CONFIG_ARCH_S390=y
 CONFIG_ARCH_S390X=y
-CONFIG_UID16=y
 
 #
 # Code maturity level options
@@ -21,6 +20,7 @@
 #
 CONFIG_SMP=y
 CONFIG_S390_SUPPORT=y
+CONFIG_UID16=y
 CONFIG_BINFMT_ELF32=y
 
 #