Merge branch 'omap-clks3' into devel

[linux-2.6-omap-h63xx.git] / drivers / s390 / Makefile

diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile
index 5a888704a8d002ca0d846308f51e052ec4a3301b..d0eae59bc3667ce8d2ee56d484777d7cb5d32ccd 100644 (file)
--- a/drivers/s390/Makefile
+++ b/drivers/s390/Makefile
@@ -4,8 +4,8 @@
 
 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 += s390mach.o sysinfo.o
+obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/
 
 drivers-y += drivers/s390/built-in.o