diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/mips/configs/ocelot_defconfig | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/configs/ocelot_defconfig')
| -rw-r--r-- | arch/mips/configs/ocelot_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 4043950d360a..920d59b56a4e 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | # Wed Jan 26 02:49:08 2005 | 4 | # Wed Jan 26 02:49:08 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 |
| @@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 82 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 82 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 83 | CONFIG_HAVE_DEC_LOCK=y | 83 | CONFIG_HAVE_DEC_LOCK=y |
| 84 | CONFIG_DMA_NONCOHERENT=y | 84 | CONFIG_DMA_NONCOHERENT=y |
| 85 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
| 85 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 86 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 86 | CONFIG_IRQ_CPU=y | 87 | CONFIG_IRQ_CPU=y |
| 87 | CONFIG_IRQ_CPU_RM7K=y | 88 | CONFIG_IRQ_CPU_RM7K=y |