projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/kconfig: Kill PPC_MULTIPLATFORM
[deliverable/linux.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
Kconfig
diff --git
a/arch/powerpc/platforms/pseries/Kconfig
b/arch/powerpc/platforms/pseries/Kconfig
index 97619fd51e393870d1c0c1da8a6bdb1926a52a57..c0e6ec240f46acd388230c616c2702487b727e1f 100644
(file)
--- a/
arch/powerpc/platforms/pseries/Kconfig
+++ b/
arch/powerpc/platforms/pseries/Kconfig
@@
-1,5
+1,5
@@
config PPC_PSERIES
config PPC_PSERIES
- depends on PPC
_MULTIPLATFORM && PPC64
+ depends on PPC
64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
select MPIC
select PPC_I8259
bool "IBM pSeries & new (POWER5-based) iSeries"
select MPIC
select PPC_I8259
@@
-25,6
+25,11
@@
config EEH
depends on PPC_PSERIES && PCI
default y if !EMBEDDED
depends on PPC_PSERIES && PCI
default y if !EMBEDDED
+config PSERIES_MSI
+ bool
+ depends on PCI_MSI && EEH
+ default y
+
config SCANLOG
tristate "Scanlog dump interface"
depends on RTAS_PROC && PPC_PSERIES
config SCANLOG
tristate "Scanlog dump interface"
depends on RTAS_PROC && PPC_PSERIES
@@
-54,7
+59,7
@@
config PPC_SMLPAR
config CMM
tristate "Collaborative memory management"
config CMM
tristate "Collaborative memory management"
- depends on PPC_SMLPAR
+ depends on PPC_SMLPAR
&& !CRASH_DUMP
default y
help
Select this option, if you want to enable the kernel interface
default y
help
Select this option, if you want to enable the kernel interface
This page took
0.025365 seconds
and
5
git commands to generate.