| Message ID | 1380181937-15156-1-git-send-email-michael@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 1edb55a473eb1151f54590371761fdeb35b3b593 |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
On Thu, Sep 26, 2013 at 05:52:16PM +1000, Michael Ellerman wrote: >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> >--- > arch/powerpc/platforms/pseries/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig >index 62b4f80..e666432 100644 >--- a/arch/powerpc/platforms/pseries/Kconfig >+++ b/arch/powerpc/platforms/pseries/Kconfig >@@ -34,7 +34,7 @@ config PPC_SPLPAR > > config PSERIES_MSI > bool >- depends on PCI_MSI && EEH >+ depends on PCI_MSI && PPC_PSERIES && EEH > default y > > config PSERIES_ENERGY Thanks, Gavin
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 62b4f80..e666432 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -34,7 +34,7 @@ config PPC_SPLPAR config PSERIES_MSI bool - depends on PCI_MSI && EEH + depends on PCI_MSI && PPC_PSERIES && EEH default y config PSERIES_ENERGY
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> --- arch/powerpc/platforms/pseries/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)