diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-31 02:14:56 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-31 02:14:56 +0400 |
commit | 8b6d8c592fa7b8bfb1218447a273314c13a67e8a (patch) | |
tree | f2024111150e6fe5328a482f2e9f2c68990b0db2 /arch/mips/configs/rbtx49xx_defconfig | |
parent | 94ad374a0751f40d25e22e036c37f7263569d24c (diff) | |
parent | de1d7bb63893b4246ce60797aa554341e908f034 (diff) | |
download | linux-8b6d8c592fa7b8bfb1218447a273314c13a67e8a.tar.xz |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cobalt: update defconfig
[MIPS] kgdb: add arch support for the kernel's kgdb core
[MIPS] kgdb: Remove existing implementation
[MIPS] TXx9: Kconfig cleanup
[MIPS] TXx9: Kill unused txx927.h
[MIPS] TXx9: Support early_printk
[MIPS] TXx9: Unify serial_txx9 setup
[MIPS] TXx9: Random cleanup
[MIPS] TXx9: Make tx4938-specific code more independent
[MIPS] TXx9: Make tx3927-specific code more independent
[MIPS] TXx9: Cleanup watchdog
[MIPS] TXx9: Cleanup restart/halt/power_off
[MIPS] TXx9: PCI error handling
[MIPS] TXx9: Add some pci options
[MIPS] Introduce pcibios_plat_setup
[MIPS] TXx9: PCI fixes for tx3927/tx4927
[MIPS] TXx9: Fix JMR3927 irq numbers
[MIPS] RB532: Flags are unsigned long
[MIPS] Initialization of Alchemy boards
[MIPS] tlb-r4k: Nuke broken paranoia error test.
Diffstat (limited to 'arch/mips/configs/rbtx49xx_defconfig')
-rw-r--r-- | arch/mips/configs/rbtx49xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig index e42aed5a38bb..c7c0864b8ce9 100644 --- a/arch/mips/configs/rbtx49xx_defconfig +++ b/arch/mips/configs/rbtx49xx_defconfig @@ -742,7 +742,6 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_KERNEL is not set # CONFIG_SAMPLES is not set CONFIG_CMDLINE="" -CONFIG_SYS_SUPPORTS_KGDB=y # # Security options |