Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging

[qemu.git] / default-configs / ppc-softmmu.mak

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index bcaa52fb10ab326c2f66fea052d78bb18a7d3aca..73e4cc5f63207d8bdaa5f38a58bb39dbcbfd9a42 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -43,5 +43,6 @@ CONFIG_XILINX=y
 CONFIG_XILINX_ETHLITE=y
 CONFIG_OPENPIC=y
 CONFIG_E500=y
+CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
 # For PReP
 CONFIG_MC146818RTC=y