summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/ddb5476_defconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-08 07:45:47 +0200
committerLen Brown <len.brown@intel.com>2005-09-08 07:45:47 +0200
commit64e47488c913ac704d465a6af86a26786d1412a5 (patch)
treed3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/mips/configs/ddb5476_defconfig
parent[ACPI] revert bad processor_core.c patch for bug 5128 (diff)
parent[SCSI] Re-do "final klist fixes" (diff)
downloadlinux-64e47488c913ac704d465a6af86a26786d1412a5.tar.xz
linux-64e47488c913ac704d465a6af86a26786d1412a5.zip
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/configs/ddb5476_defconfig')
-rw-r--r--arch/mips/configs/ddb5476_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index d43ed57c4b4e..70addc73f699 100644
--- a/arch/mips/configs/ddb5476_defconfig
+++ b/arch/mips/configs/ddb5476_defconfig
@@ -4,9 +4,9 @@
# Wed Jan 26 02:49:02 2005
#
CONFIG_MIPS=y
-# CONFIG_MIPS64 is not set
# CONFIG_64BIT is not set
-CONFIG_MIPS32=y
+# CONFIG_64BIT is not set
+CONFIG_32BIT=y
#
# Code maturity level options
@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_HAVE_DEC_LOCK=y
CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_I8259=y
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_IRQ_CPU=y