summaryrefslogtreecommitdiff
path: root/arch/mips/configs/pnx8550-jbs_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 15:08:47 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-13 15:08:47 +0400
commita12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch)
tree957c915298b299902aa80afa7c78e94c71b3dc25 /arch/mips/configs/pnx8550-jbs_defconfig
parent7b27718bdb1b70166383dec91391df5534d449ee (diff)
parent30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff)
downloadlinux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/mips/configs/pnx8550-jbs_defconfig')
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 37c7b5ffd474..723bd5176a35 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -1216,10 +1216,8 @@ CONFIG_DEBUG_MUTEXES=y
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
+CONFIG_CMDLINE="console=ttyS1,38400n8 root=/dev/nfs ip=bootp"
# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_KGDB is not set
-CONFIG_SYS_SUPPORTS_KGDB=y
# CONFIG_RUNTIME_DEBUG is not set
#