From 660f8d9ad97f5bfc5b27c3594fe3b97994fc21bb Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 16 Jan 2012 11:57:18 -0800 Subject: [PATCH] --- yaml --- r: 286568 b: refs/heads/master c: 5ee71535440f034de1196b11f78cef81c4025c2b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 0755c6ac1271..e95d17f2b5be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b54bd9be35f4084edb3eb9ee054a43f722a67483 +refs/heads/master: 5ee71535440f034de1196b11f78cef81c4025c2b diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 5731eb70e0a0..db190faffba1 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -120,16 +120,6 @@ config HAVE_LATENCYTOP_SUPPORT config MMU def_bool y -config ZONE_DMA - bool "DMA memory allocation support" if EXPERT - default y - help - DMA memory allocation support allows devices with less than 32-bit - addressing to allocate within the first 16MB of address space. - Disable if no such devices will be used. - - If unsure, say Y. - config SBUS bool @@ -253,6 +243,16 @@ source "kernel/Kconfig.freezer" menu "Processor type and features" +config ZONE_DMA + bool "DMA memory allocation support" if EXPERT + default y + help + DMA memory allocation support allows devices with less than 32-bit + addressing to allocate within the first 16MB of address space. + Disable if no such devices will be used. + + If unsure, say Y. + source "kernel/time/Kconfig" config SMP