From 321c0aadba1de2f098991221211404b41d15d6e8 Mon Sep 17 00:00:00 2001 From: Grant Grundler Date: Fri, 21 Oct 2005 22:52:46 -0400 Subject: [PATCH] --- yaml --- r: 10500 b: refs/heads/master c: 8b631342dd9db9ca272e11814e041e4ee3d1a948 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/Kconfig | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7792155cd33e..f258d7866c53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5beb5f32c56b70f79117e13a1abd54824a78466c +refs/heads/master: 8b631342dd9db9ca272e11814e041e4ee3d1a948 diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig index 0b07922a2ac6..874a283edb95 100644 --- a/trunk/arch/parisc/Kconfig +++ b/trunk/arch/parisc/Kconfig @@ -47,10 +47,10 @@ config PM config ISA_DMA_API bool - default y config ARCH_MAY_HAVE_PC_FDC bool + depends on BROKEN default y source "init/Kconfig" @@ -154,13 +154,14 @@ config HOTPLUG_CPU config ARCH_DISCONTIGMEM_ENABLE bool "Discontiguous memory support (EXPERIMENTAL)" - depends on EXPERIMENTAL + depends on 64BIT && EXPERIMENTAL help Say Y to support efficient handling of discontiguous physical memory, for architectures which are either NUMA (Non-Uniform Memory Access) or have huge holes in the physical address space for other reasons. See for more. +source "kernel/Kconfig.hz" source "mm/Kconfig" config PREEMPT