diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/mips/configs/ip32_defconfig | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/mips/configs/ip32_defconfig')
| -rw-r--r-- | arch/mips/configs/ip32_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 47f49b60c5d6..2c5c624c5d42 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
| @@ -37,7 +37,6 @@ CONFIG_ZONE_DMA=y | |||
| 37 | # CONFIG_PNX8550_STB810 is not set | 37 | # CONFIG_PNX8550_STB810 is not set |
| 38 | # CONFIG_MACH_VR41XX is not set | 38 | # CONFIG_MACH_VR41XX is not set |
| 39 | # CONFIG_PMC_YOSEMITE is not set | 39 | # CONFIG_PMC_YOSEMITE is not set |
| 40 | # CONFIG_QEMU is not set | ||
| 41 | # CONFIG_MARKEINS is not set | 40 | # CONFIG_MARKEINS is not set |
| 42 | # CONFIG_SGI_IP22 is not set | 41 | # CONFIG_SGI_IP22 is not set |
| 43 | # CONFIG_SGI_IP27 is not set | 42 | # CONFIG_SGI_IP27 is not set |
| @@ -47,7 +46,6 @@ CONFIG_SGI_IP32=y | |||
| 47 | # CONFIG_SIBYTE_SENTOSA is not set | 46 | # CONFIG_SIBYTE_SENTOSA is not set |
| 48 | # CONFIG_SIBYTE_RHONE is not set | 47 | # CONFIG_SIBYTE_RHONE is not set |
| 49 | # CONFIG_SIBYTE_CARMEL is not set | 48 | # CONFIG_SIBYTE_CARMEL is not set |
| 50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
| 51 | # CONFIG_SIBYTE_LITTLESUR is not set | 49 | # CONFIG_SIBYTE_LITTLESUR is not set |
| 52 | # CONFIG_SIBYTE_CRHINE is not set | 50 | # CONFIG_SIBYTE_CRHINE is not set |
| 53 | # CONFIG_SIBYTE_CRHONE is not set | 51 | # CONFIG_SIBYTE_CRHONE is not set |