Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[karo-tx-linux.git] / drivers / s390 / Makefile

diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile
index 5a888704a8d002ca0d846308f51e052ec4a3301b..95bccfd3f169a8a3a167368f972cbbd08de7c869 100644 (file)
--- a/drivers/s390/Makefile
+++ b/drivers/s390/Makefile
@@ -2,10 +2,7 @@
 # Makefile for the S/390 specific device drivers
 #
 
-CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
-
-obj-y += s390mach.o sysinfo.o s390_rdev.o
-obj-y += cio/ block/ char/ crypto/ net/ scsi/
+obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/
 
 drivers-y += drivers/s390/built-in.o