diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 21:53:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 21:53:14 +0100 |
| commit | 6e9131cc43a672003a75483d9b9db5c51015ae5f (patch) | |
| tree | 23deb539a695272dc9f003b4ab094037ccc10f31 /arch/s390/kvm/Makefile | |
| parent | tty: Remove ASYNC_CLOSING (diff) | |
| parent | Linux 4.5-rc2 (diff) | |
| download | linux-6e9131cc43a672003a75483d9b9db5c51015ae5f.tar.xz linux-6e9131cc43a672003a75483d9b9db5c51015ae5f.zip | |
Merge 4.5-rc2 into tty-next
We want the tty/serial fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/kvm/Makefile')
| -rw-r--r-- | arch/s390/kvm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index b3b553469650..d42fa38c2429 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -7,7 +7,7 @@ # as published by the Free Software Foundation. KVM := ../../../virt/kvm -common-objs = $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/async_pf.o $(KVM)/irqchip.o +common-objs = $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/async_pf.o $(KVM)/irqchip.o $(KVM)/vfio.o ccflags-y := -Ivirt/kvm -Iarch/s390/kvm |