On Wed, Sep 27, 2017 at 01:42:01PM +0200, Thomas Huth wrote: > diff --git a/drivers/s390/virtio/Makefile b/drivers/s390/virtio/Makefile > index df40692..d9942e0 100644 > --- a/drivers/s390/virtio/Makefile > +++ b/drivers/s390/virtio/Makefile > @@ -7,7 +7,4 @@ > # as published by the Free Software Foundation. > > s390-virtio-objs := virtio_ccw.o > -ifdef CONFIG_S390_GUEST_OLD_TRANSPORT > -s390-virtio-objs += kvm_virtio.o > -endif > obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs) Would you mind to simplify the Makefile to just the single line obj-$(CONFIG_S390_GUEST) += virtio_ccw.o while you are touching it anyway?