diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /arch/mips/configs/pnx8550-jbs_defconfig | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/mips/configs/pnx8550-jbs_defconfig')
| -rw-r--r-- | arch/mips/configs/pnx8550-jbs_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index ac616c82d348..1cbf270c301c 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_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 is not set | 27 | # CONFIG_MIPS_EV64120 is not set |
| 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 |