Merge branch 'davem-next.via-rhine' of git://violet.fr.zoreil.com/romieu/linux

[~andy/linux] / arch / s390 / Kbuild

diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild
index ae4b01060eddea83a976ca96cc81c320d21eec35..9858476fa0fee62dc8a25a4996203abaaeb3a942 100644 (file)
--- a/arch/s390/Kbuild
+++ b/arch/s390/Kbuild
@@ -1,6 +1,7 @@
-obj-y += kernel/
-obj-y += mm/
-obj-y += crypto/
-obj-y += appldata/
-obj-y += hypfs/
-obj-y += kvm/
+obj-y                          += kernel/
+obj-y                          += mm/
+obj-$(CONFIG_KVM)              += kvm/
+obj-$(CONFIG_CRYPTO_HW)                += crypto/
+obj-$(CONFIG_S390_HYPFS_FS)    += hypfs/
+obj-$(CONFIG_APPLDATA_BASE)    += appldata/
+obj-$(CONFIG_MATHEMU)          += math-emu/