diff options
| author | Grant Grundler <grundler@parisc-linux.org> | 2005-10-21 22:52:46 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-21 22:52:46 -0400 |
| commit | 8b631342dd9db9ca272e11814e041e4ee3d1a948 (patch) | |
| tree | 52d7975960c6f018ce0bdab1566e9b41511b7cbf /arch/parisc | |
| parent | 5beb5f32c56b70f79117e13a1abd54824a78466c (diff) | |
| download | kernel_samsung_smdk4412-8b631342dd9db9ca272e11814e041e4ee3d1a948.zip kernel_samsung_smdk4412-8b631342dd9db9ca272e11814e041e4ee3d1a948.tar.gz kernel_samsung_smdk4412-8b631342dd9db9ca272e11814e041e4ee3d1a948.tar.bz2 | |
[PARISC] Update Kconfig for itimer selection
2.6.14-rc2-pa1: enable 100/250/1000HZ itimer selection
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Mark floppy as broken. Thanks Joel
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
make DISCONTIGMEM depend on 64BIT
Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 0b07922..874a283 100644 --- a/arch/parisc/Kconfig +++ b/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 <file:Documentation/vm/numa> for more. +source "kernel/Kconfig.hz" source "mm/Kconfig" config PREEMPT |