Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b631342 authored by Grant Grundler's avatar Grant Grundler Committed by Kyle McMartin
Browse files

[PARISC] Update Kconfig for itimer selection 



2.6.14-rc2-pa1: enable 100/250/1000HZ itimer selection

Signed-off-by: default avatarGrant Grundler <grundler@parisc-linux.org>

Mark floppy as broken.  Thanks Joel

Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>

make DISCONTIGMEM depend on 64BIT

Signed-off-by: default avatarThibaut VARENE <varenet@parisc-linux.org>

Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 5beb5f32

arch/parisc/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -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