diff --git a/[refs] b/[refs]
index 20cd38bead27..455ac933b32d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddd6f9537dee9b713b87ecdc9ac920cd1935fdef
+refs/heads/master: 3b7f993394db7c446c251fb8eb32ec501a330acc
diff --git a/trunk/arch/s390/Kbuild b/trunk/arch/s390/Kbuild
index ae4b01060edd..9858476fa0fe 100644
--- a/trunk/arch/s390/Kbuild
+++ b/trunk/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/trunk/arch/s390/Makefile b/trunk/arch/s390/Makefile
index 27a0b5df5ead..e9f353341693 100644
--- a/trunk/arch/s390/Makefile
+++ b/trunk/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/