diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
| commit | d7f6884ae0ae6e406ec3500fcde16e8f51642460 (patch) | |
| tree | efceb246a4fa12921b7dbd3946a88fa257684405 /arch/mips/configs/ocelot_3_defconfig | |
| parent | cd28ab6a4e50a7601d22752aa7ce0c8197b10bdf (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/mips/configs/ocelot_3_defconfig')
| -rw-r--r-- | arch/mips/configs/ocelot_3_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index 2cce682fffcf..b4cf97a732bc 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | # Wed Jan 26 02:49:07 2005 | 4 | # Wed Jan 26 02:49:07 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | # CONFIG_MIPS64 is not set | ||
| 8 | # CONFIG_64BIT is not set | 7 | # CONFIG_64BIT is not set |
| 9 | CONFIG_MIPS32=y | 8 | # CONFIG_64BIT is not set |
| 9 | CONFIG_32BIT=y | ||
| 10 | 10 | ||
| 11 | # | 11 | # |
| 12 | # Code maturity level options | 12 | # Code maturity level options |
| @@ -89,6 +89,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 89 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 89 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 90 | CONFIG_HAVE_DEC_LOCK=y | 90 | CONFIG_HAVE_DEC_LOCK=y |
| 91 | CONFIG_DMA_NONCOHERENT=y | 91 | CONFIG_DMA_NONCOHERENT=y |
| 92 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
| 92 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 93 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 93 | CONFIG_IRQ_CPU=y | 94 | CONFIG_IRQ_CPU=y |
| 94 | CONFIG_IRQ_CPU_RM7K=y | 95 | CONFIG_IRQ_CPU_RM7K=y |