Update of /cvsroot/gc-linux/linux/arch/ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22637/arch/ppc
Modified Files:
Kconfig
Log Message:
Merged 2.6.19.
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Kconfig 17 Feb 2007 23:43:40 -0000 1.37
+++ Kconfig 18 Feb 2007 22:56:00 -0000 1.38
@@ -983,6 +983,9 @@
config HIGHMEM
bool "High memory support"
+config ARCH_POPULATES_NODE_MAP
+ def_bool y
+
source kernel/Kconfig.hz
source kernel/Kconfig.preempt
source "mm/Kconfig"
@@ -1234,7 +1237,7 @@
default PCI
config MPC83xx_PCI2
- bool " Supprt for 2nd PCI host controller"
+ bool "Support for 2nd PCI host controller"
depends on PCI && MPC834x
default y if MPC834x_SYS
@@ -1253,12 +1256,12 @@
default y
config 8260_PCI9
- bool " Enable workaround for MPC826x erratum PCI 9"
+ bool "Enable workaround for MPC826x erratum PCI 9"
depends on PCI_8260 && !ADS8272
default y
choice
- prompt " IDMA channel for PCI 9 workaround"
+ prompt "IDMA channel for PCI 9 workaround"
depends on 8260_PCI9
config 8260_PCI9_IDMA1
@@ -1374,7 +1377,7 @@
depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
help
This option allows you to set the base virtual address
- of the the consistent memory pool. This pool of virtual
+ of the consistent memory pool. This pool of virtual
memory is used to make consistent memory allocations.
config CONSISTENT_START
@@ -1385,7 +1388,7 @@
bool "Set custom consistent memory pool size"
depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
help
- This option allows you to set the size of the the
+ This option allows you to set the size of the
consistent memory pool. This pool of virtual memory
is used to make consistent memory allocations.
|
