summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/yosemite_defconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 03:14:47 +0200
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 03:14:47 +0200
commitd344c5e0856ad03278d8700b503762dbc8b86e12 (patch)
treea6d893a643470a3c2580a58f3228a55fa1fd1d82 /arch/mips/configs/yosemite_defconfig
parentInput: HIDDEV - make HIDIOCSREPORT wait IO completion (diff)
parent[PATCH] md: fix BUG when raid10 rebuilds without enough drives (diff)
downloadlinux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz
linux-d344c5e0856ad03278d8700b503762dbc8b86e12.zip
Manual merge with Linus
Diffstat (limited to 'arch/mips/configs/yosemite_defconfig')
-rw-r--r--arch/mips/configs/yosemite_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index 562f2b8043ac..6d2290777ad7 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -4,9 +4,9 @@
# Wed Jan 26 02:49:13 2005
#
CONFIG_MIPS=y
-# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set
-CONFIG_MIPS32=y
+# CONFIG_64BIT is not set
+CONFIG_32BIT=y
#
# Code maturity level options