xserver: Branch 'master'

[Peter Hutterer]

 hw/kdrive/ephyr/meson.build |    1 -
 hw/kdrive/src/meson.build   |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 11c133aafe63c776bde502057243d67fe2c630c8
Author: Eric Anholt <eric at anholt.net>
Date:   Wed May 3 15:33:46 2017 -0700

    meson: Fix kdrive build.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/kdrive/ephyr/meson.build b/hw/kdrive/ephyr/meson.build
index cf1cfd5e0..615649865 100644
--- a/hw/kdrive/ephyr/meson.build
+++ b/hw/kdrive/ephyr/meson.build
@@ -4,7 +4,6 @@ srcs = [
     'ephyrcursor.c',
     'ephyr_draw.c',
     'hostx.c',
-    'os.c',
 ]
 
 xephyr_dep = [
diff --git a/hw/kdrive/src/meson.build b/hw/kdrive/src/meson.build
index d257307cb..06bc34e04 100644
--- a/hw/kdrive/src/meson.build
+++ b/hw/kdrive/src/meson.build
@@ -3,7 +3,6 @@ srcs_kdrive = [
     'kdrive.c',
     'kinfo.c',
     'kinput.c',
-    'kmode.c',
     'kshadow.c',
     '../../../mi/miinitext.c',
 ]