Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging

[qemu.git] / hw / timer / Makefile.objs

diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 15cce1c5312050895f6753149e7e6f8455b84b31..8c19eac3b6bf070df748ead094b0a1d74a7c35e6 100644 (file)
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -42,3 +42,4 @@ common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o
 
 common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
 common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o
+common-obj-$(CONFIG_MSF2) += mss-timer.o