diff -urpN -X /home/fletch/.diff.exclude 520-queuestat/Makefile 550-config_debug/Makefile
--- 520-queuestat/Makefile	Wed Aug 13 20:29:29 2003
+++ 550-config_debug/Makefile	Wed Aug 13 20:47:30 2003
@@ -326,7 +326,7 @@ ifdef CONFIG_DEBUG_INFO
 CFLAGS		+= -g
 endif
 
-ifdef CONFIG_X86_REMOTE_DEBUG
+ifdef CONFIG_DEBUG_SYMBOLS 
 CFLAGS += -g
 endif
 
diff -urpN -X /home/fletch/.diff.exclude 520-queuestat/arch/i386/Kconfig 550-config_debug/arch/i386/Kconfig
--- 520-queuestat/arch/i386/Kconfig	Wed Aug 13 20:46:17 2003
+++ 550-config_debug/arch/i386/Kconfig	Wed Aug 13 20:47:30 2003
@@ -1311,6 +1311,14 @@ config DEBUG_KERNEL
 	  Say Y here if you are developing drivers or trying to debug and
 	  identify kernel problems.
 
+config DEBUG_SYMBOLS_PROMPT
+	bool "Get debug symbols (turns on -g)"
+	depends on DEBUG_KERNEL
+
+config DEBUG_SYMBOLS
+	bool
+	depends on DEBUG_SYMBOLS_PROMPT || X86_REMOTE_DEBUG
+
 config DEBUG_STACKOVERFLOW
 	bool "Check for stack overflows"
 	depends on DEBUG_KERNEL