aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/configs/db1100_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 17:21:38 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 17:21:38 -0800
commit200d018eff4be3a1fb9823441cfcebb7de86a677 (patch)
tree76dc7b8643da0fc19208067c44e3f346f11f6cc8 /arch/mips/configs/db1100_defconfig
parenteb991b39385c7b04923d701764a34694ec54b53d (diff)
parentf0647a52974daccbe20990fb6341f07792445fe0 (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [PATCH] add STB810 support (Philips PNX8550-based) [MIPS] Qemu now has an ELF loader. [MIPS] Add GENERIC_HARDIRQS_NO__DO_IRQ for i8259 users [MIPS] Optimize csum_partial for 64bit kernel [MIPS] Optimize flow of csum_partial [MIPS] Make csum_partial more readable [MIPS] Rename SNI_RM200_PCI to just SNI_RM preparing for more RM machines
Diffstat (limited to 'arch/mips/configs/db1100_defconfig')
-rw-r--r--arch/mips/configs/db1100_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 025b960ba99..0055ec41f20 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -59,7 +59,7 @@ CONFIG_MIPS_DB1100=y
# CONFIG_SIBYTE_LITTLESUR is not set
# CONFIG_SIBYTE_CRHINE is not set
# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_SNI_RM is not set
# CONFIG_TOSHIBA_JMR3927 is not set
# CONFIG_TOSHIBA_RBTX4927 is not set
# CONFIG_TOSHIBA_RBTX4938 is not set