[S390] make arch/s390 subdirectories depend on config option

Only add subdirectories of arch/s390 to kbuild if their respective
config option is selected.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

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/

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 27a0b5df5ead424de0532aaaa20c85c77b1cbaad..e9f353341693615249c9ef76501920c457360e8a 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -99,7 +99,6 @@ core-y                += arch/s390/
 
 libs-y         += arch/s390/lib/
 drivers-y      += drivers/s390/
-drivers-$(CONFIG_MATHEMU) += arch/s390/math-emu/
 
 # must be linked after kernel
 drivers-$(CONFIG_OPROFILE)     += arch/s390/oprofile/