diff options
author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/mips/configs/yosemite_defconfig | |
parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/configs/yosemite_defconfig')
-rw-r--r-- | arch/mips/configs/yosemite_defconfig | 4 |
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 @@ | |||
4 | # Wed Jan 26 02:49:13 2005 | 4 | # Wed Jan 26 02:49:13 2005 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | # CONFIG_MIPS64 is not set | ||
8 | # CONFIG_64BIT is not set | 7 | # CONFIG_64BIT is not set |
9 | CONFIG_MIPS32=y | 8 | # CONFIG_64BIT is not set |
9 | CONFIG_32BIT=y | ||
10 | 10 | ||
11 | # | 11 | # |
12 | # Code maturity level options | 12 | # Code maturity level options |