diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2013-09-26 03:52:16 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-01 22:16:05 -0500 |
| commit | 1edb55a473eb1151f54590371761fdeb35b3b593 (patch) | |
| tree | 58272b5cc3fa63d1d8adb4222fec201c96b9f389 /arch/powerpc/platforms | |
| parent | fd7e42960d7bdf825fedc665727baab4cec44164 (diff) | |
powerpc/pseries: CONFIG_PSERIES_MSI should depend on PPC_PSERIES
Previously PSERIES_MSI depended on PPC_PSERIES via EEH. However in
commit 317f06d "powerpc/eeh: Move common part to kernel directory" we
made CONFIG_EEH selectable on POWERNV. That leaves us with PSERIES_MSI
being live even when PSERIES=n. Fix it by making PSERIES_MSI depend
directly on PPC_PSERIES.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 62b4f8025de0..e66643250fee 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
| @@ -34,7 +34,7 @@ config PPC_SPLPAR | |||
| 34 | 34 | ||
| 35 | config PSERIES_MSI | 35 | config PSERIES_MSI |
| 36 | bool | 36 | bool |
| 37 | depends on PCI_MSI && EEH | 37 | depends on PCI_MSI && PPC_PSERIES && EEH |
| 38 | default y | 38 | default y |
| 39 | 39 | ||
| 40 | config PSERIES_ENERGY | 40 | config PSERIES_ENERGY |