diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 10971be4306156a5eddc22746246c7a80dd83ea7..25e6a0bc62abc2eea03ffd34dd2305a6458783d7 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -403,7 +403,7 @@ comment "The following must be set to a higher priority than local_irq_disable()
 
 config GDBSTUB_IRQ_LEVEL
 	int "GDBSTUB interrupt priority"
-	depends on GDBSTUB
+	depends on KERNEL_DEBUGGER
 	range 0 1 if LINUX_CLI_LEVEL = 2
 	range 0 2 if LINUX_CLI_LEVEL = 3
 	range 0 3 if LINUX_CLI_LEVEL = 4
diff --git a/arch/mn10300/Kconfig.debug b/arch/mn10300/Kconfig.debug
index a1b8620f65ae4bc778167a3b9a5e7108d44769be..87adb8f434ee7da04f06584df0d18496591fcdbe 100644
--- a/arch/mn10300/Kconfig.debug
+++ b/arch/mn10300/Kconfig.debug
@@ -150,3 +150,7 @@ config GDBSTUB_ON_TTYSx
 	default y
 
 endmenu
+
+config KERNEL_DEBUGGER
+	def_bool y
+	depends on GDBSTUB
diff --git a/arch/mn10300/include/asm/debugger.h b/arch/mn10300/include/asm/debugger.h
new file mode 100644
index 0000000000000000000000000000000000000000..4816f0dc28b54a1c0194078c4b43150a6352e0ca
--- /dev/null
+++ b/arch/mn10300/include/asm/debugger.h
@@ -0,0 +1,20 @@
+/* Kernel debugger for MN10300
+ *
+ * Copyright (C) 2011 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _ASM_DEBUGGER_H
+#define _ASM_DEBUGGER_H
+
+#if defined(CONFIG_KERNEL_DEBUGGER)
+
+#else /* CONFIG_KERNEL_DEBUGGER */
+
+#endif /* CONFIG_KERNEL_DEBUGGER */
+#endif /* _ASM_DEBUGGER_H */