summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/ip27_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-11 10:49:34 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-11 10:49:34 +0100
commitd95c3578120e5bc4784069439f00ccb1b5f87717 (patch)
treec819de31de3983f3d69f223ede07667ff23bf7da /arch/mips/configs/ip27_defconfig
parentba1d755a36f66101aa88ac9ebb54694def6ec38d (diff)
parent78b020d035074fc3aa4d017353bb2c32e2aff56f (diff)
downloadblackbird-op-linux-d95c3578120e5bc4784069439f00ccb1b5f87717.tar.gz
blackbird-op-linux-d95c3578120e5bc4784069439f00ccb1b5f87717.zip
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'arch/mips/configs/ip27_defconfig')
-rw-r--r--arch/mips/configs/ip27_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 34ea319be94c..f2baea3039bb 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -53,7 +53,7 @@ CONFIG_GENERIC_TIME=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_ARC=y
-CONFIG_DMA_IP27=y
+CONFIG_DMA_COHERENT=y
CONFIG_EARLY_PRINTK=y
CONFIG_SYS_HAS_EARLY_PRINTK=y
# CONFIG_NO_IOPORT is not set
OpenPOWER on IntegriCloud