xserver: Branch 'master'

[Keith Packard]

 hw/kdrive/linux/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d727ddb91a549d23f6bf323e91db4b8916c1b7a0
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sat Jan 9 16:28:32 2010 -0500

    kdrive: klinux.h breaks make dist
    
    This file is no longer part of the source code
    and must be removed from distribution.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Reviewed-by: Mikhail Gusarov <dottedmag at dottedmag.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index fe4a3d1..93e5d2f 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = liblinux.la
 
 liblinux_la_SOURCES =
 
-liblinux_la_SOURCES += linux.c klinux.h
+liblinux_la_SOURCES += linux.c
 
 if KDRIVE_KBD
 liblinux_la_SOURCES += keyboard.c