diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:16:47 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:16:47 +0200 |
commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /arch/mips/configs/sead_defconfig | |
parent | [PATCH] Fix reference of uninitialised memory in ata_device_add() (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-3b9f6cb8a1ec791be79c6c7595fea922f12d1e64.tar.xz linux-3b9f6cb8a1ec791be79c6c7595fea922f12d1e64.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/mips/configs/sead_defconfig')
-rw-r--r-- | arch/mips/configs/sead_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index 4401b602118f..02abb2f1bfaf 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig @@ -25,7 +25,6 @@ CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MIPS_EV64120 is not set -# CONFIG_MIPS_EV96100 is not set # CONFIG_MIPS_IVR is not set # CONFIG_MIPS_ITE8172 is not set # CONFIG_MACH_JAZZ is not set |