diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /arch/mips/configs/ev64120_defconfig | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/mips/configs/ev64120_defconfig')
| -rw-r--r-- | arch/mips/configs/ev64120_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index b0afc118bd5c..bc4c4f125c48 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig | |||
| @@ -25,7 +25,6 @@ CONFIG_MIPS=y | |||
| 25 | # CONFIG_MIPS_COBALT is not set | 25 | # CONFIG_MIPS_COBALT is not set |
| 26 | # CONFIG_MACH_DECSTATION is not set | 26 | # CONFIG_MACH_DECSTATION is not set |
| 27 | CONFIG_MIPS_EV64120=y | 27 | CONFIG_MIPS_EV64120=y |
| 28 | # CONFIG_MIPS_EV96100 is not set | ||
| 29 | # CONFIG_MIPS_IVR is not set | 28 | # CONFIG_MIPS_IVR is not set |
| 30 | # CONFIG_MIPS_ITE8172 is not set | 29 | # CONFIG_MIPS_ITE8172 is not set |
| 31 | # CONFIG_MACH_JAZZ is not set | 30 | # CONFIG_MACH_JAZZ is not set |