diff -urN RC14-rc3-git4-kconfig/arch/ppc/Kconfig.debug RC14-rc3-git4-disable-DI/arch/ppc/Kconfig.debug
--- RC14-rc3-git4-kconfig/arch/ppc/Kconfig.debug	2005-09-05 07:05:13.000000000 -0400
+++ RC14-rc3-git4-disable-DI/arch/ppc/Kconfig.debug	2005-10-04 15:13:42.000000000 -0400
@@ -4,7 +4,7 @@
 
 config KGDB
 	bool "Include kgdb kernel debugger"
-	depends on DEBUG_KERNEL && (BROKEN || PPC_GEN550 || 4xx)
+	depends on DEBUG_KERNEL && (BROKEN || PPC_GEN550 || 4xx) && DISABLED
 	select DEBUG_INFO
 	help
 	  Include in-kernel hooks for kgdb, the Linux kernel source level
diff -urN RC14-rc3-git4-kconfig/arch/um/Kconfig.debug RC14-rc3-git4-disable-DI/arch/um/Kconfig.debug
--- RC14-rc3-git4-kconfig/arch/um/Kconfig.debug	2005-09-05 07:05:14.000000000 -0400
+++ RC14-rc3-git4-disable-DI/arch/um/Kconfig.debug	2005-10-04 15:13:42.000000000 -0400
@@ -36,7 +36,7 @@
 
 config GCOV
 	bool "Enable gcov support"
-	depends on DEBUG_INFO && MODE_SKAS
+	depends on DEBUG_INFO && MODE_SKAS && DISABLED
 	help
         This option allows developers to retrieve coverage data from a UML
         session.
diff -urN RC14-rc3-git4-kconfig/lib/Kconfig.debug RC14-rc3-git4-disable-DI/lib/Kconfig.debug
--- RC14-rc3-git4-kconfig/lib/Kconfig.debug	2005-09-13 13:29:28.000000000 -0400
+++ RC14-rc3-git4-disable-DI/lib/Kconfig.debug	2005-10-04 15:13:42.000000000 -0400
@@ -137,7 +137,7 @@
 
 config DEBUG_INFO
 	bool "Compile the kernel with debug info"
-	depends on DEBUG_KERNEL
+	depends on DEBUG_KERNEL && DISABLED
 	help
           If you say Y here the resulting kernel image will include
 	  debugging info resulting in a larger kernel image.