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/ip32_defconfig | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/configs/ip32_defconfig')
| -rw-r--r-- | arch/mips/configs/ip32_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index bdf1415475ff..b26e1173365d 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | # Wed Jan 26 02:49:04 2005 | 4 | # Wed Jan 26 02:49:04 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | CONFIG_MIPS64=y | 7 | CONFIG_64BIT=y |
| 8 | CONFIG_64BIT=y | 8 | CONFIG_64BIT=y |
| 9 | 9 | ||
| 10 | # | 10 | # |
| @@ -84,6 +84,7 @@ CONFIG_ARC=y | |||
| 84 | CONFIG_DMA_IP32=y | 84 | CONFIG_DMA_IP32=y |
| 85 | CONFIG_OWN_DMA=y | 85 | CONFIG_OWN_DMA=y |
| 86 | CONFIG_DMA_NONCOHERENT=y | 86 | CONFIG_DMA_NONCOHERENT=y |
| 87 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
| 87 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 88 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 88 | CONFIG_ARC32=y | 89 | CONFIG_ARC32=y |
| 89 | CONFIG_BOOT_ELF32=y | 90 | CONFIG_BOOT_ELF32=y |