git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
ppc
/
Kconfig
diff --git
a/arch/ppc/Kconfig
b/arch/ppc/Kconfig
index
a04cdf0
..
fdd9e7b
100644
(file)
--- a/
arch/ppc/Kconfig
+++ b/
arch/ppc/Kconfig
@@
-953,6
+953,9
@@
config NR_CPUS
config HIGHMEM
bool "High memory support"
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"
source kernel/Kconfig.hz
source kernel/Kconfig.preempt
source "mm/Kconfig"
@@
-1204,7
+1207,7
@@
config PCI_DOMAINS
default PCI
config MPC83xx_PCI2
default PCI
config MPC83xx_PCI2
- bool "
Supp
rt for 2nd PCI host controller"
+ bool "
Suppo
rt for 2nd PCI host controller"
depends on PCI && MPC834x
default y if MPC834x_SYS
depends on PCI && MPC834x
default y if MPC834x_SYS
@@
-1223,12
+1226,12
@@
config PCI_8260
default y
config 8260_PCI9
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
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
depends on 8260_PCI9
config 8260_PCI9_IDMA1