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/lasat_defconfig | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/mips/configs/lasat_defconfig')
| -rw-r--r-- | arch/mips/configs/lasat_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig index 2c665fcef089..e6aef999854c 100644 --- a/arch/mips/configs/lasat_defconfig +++ b/arch/mips/configs/lasat_defconfig | |||
| @@ -25,7 +25,6 @@ CONFIG_LASAT=y | |||
| 25 | # CONFIG_PNX8550_STB810 is not set | 25 | # CONFIG_PNX8550_STB810 is not set |
| 26 | # CONFIG_PMC_MSP is not set | 26 | # CONFIG_PMC_MSP is not set |
| 27 | # CONFIG_PMC_YOSEMITE is not set | 27 | # CONFIG_PMC_YOSEMITE is not set |
| 28 | # CONFIG_QEMU is not set | ||
| 29 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
| 30 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
| @@ -36,7 +35,6 @@ CONFIG_LASAT=y | |||
| 36 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
| 37 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
| 38 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
| 39 | # CONFIG_SIBYTE_PTSWARM is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
| 41 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
| 42 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |