diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /arch/mips/configs/capcella_defconfig | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'arch/mips/configs/capcella_defconfig')
| -rw-r--r-- | arch/mips/configs/capcella_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index a94f14b5c8fa..185df23fd460 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
| @@ -14,9 +14,7 @@ CONFIG_MIPS=y | |||
| 14 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
| 16 | # CONFIG_LEMOTE_FULONG is not set | 16 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | ||
| 18 | # CONFIG_MIPS_MALTA is not set | 17 | # CONFIG_MIPS_MALTA is not set |
| 19 | # CONFIG_MIPS_SEAD is not set | ||
| 20 | # CONFIG_MIPS_SIM is not set | 18 | # CONFIG_MIPS_SIM is not set |
| 21 | # CONFIG_MARKEINS is not set | 19 | # CONFIG_MARKEINS is not set |
| 22 | CONFIG_MACH_VR41XX=y | 20 | CONFIG_MACH_VR41XX=y |