11 files changed, 39 insertions, 6 deletions
diff --git a/xserver/hw/xfree86/os-support/Makefile.in b/xserver/hw/xfree86/os-support/Makefile.in
index 5bf6da2e4..3461823f5 100644
--- a/xserver/hw/xfree86/os-support/Makefile.in
+++ b/xserver/hw/xfree86/os-support/Makefile.in
@@ -238,6 +238,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in
index 26fc18e53..7452b493d 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in
@@ -253,6 +253,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/bus/Makefile.in b/xserver/hw/xfree86/os-support/bus/Makefile.in
index 2515f74b7..5ecbdb73b 100644
--- a/xserver/hw/xfree86/os-support/bus/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bus/Makefile.in
@@ -258,6 +258,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/hurd/Makefile.in b/xserver/hw/xfree86/os-support/hurd/Makefile.in
index 35bd66f0f..2c9013e01 100644
--- a/xserver/hw/xfree86/os-support/hurd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/hurd/Makefile.in
@@ -56,9 +56,9 @@ CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libhurd_la_LIBADD =
 am_libhurd_la_OBJECTS = hurd_init.lo hurd_mmap.lo hurd_mouse.lo \
-	hurd_video.lo VTsw_noop.lo posix_tty.lo libc_wrapper.lo \
-	stdResource.lo stdPci.lo sigiostubs.lo pm_noop.lo kmod_noop.lo \
-	agp_noop.lo
+	hurd_video.lo hurd_io.lo hurd_kbd.lo VTsw_noop.lo posix_tty.lo \
+	libc_wrapper.lo stdResource.lo stdPci.lo sigiostubs.lo \
+	pm_noop.lo kmod_noop.lo agp_noop.lo at_scancode.lo
 libhurd_la_OBJECTS = $(am_libhurd_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -223,6 +223,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
@@ -537,7 +539,7 @@ xglmoduledir = @xglmoduledir@
 xpconfigdir = @xpconfigdir@
 noinst_LTLIBRARIES = libhurd.la
 libhurd_la_SOURCES = hurd_init.c hurd_mmap.c \
-		hurd_mouse.c hurd_video.c \
+		hurd_mouse.c hurd_video.c hurd_io.c hurd_kbd.c \
 		$(srcdir)/../shared/VTsw_noop.c \
 		$(srcdir)/../shared/posix_tty.c \
 		$(srcdir)/../shared/libc_wrapper.c \
@@ -546,9 +548,10 @@ libhurd_la_SOURCES = hurd_init.c hurd_mmap.c \
 		$(srcdir)/../shared/sigiostubs.c \
 		$(srcdir)/../shared/pm_noop.c \
 		$(srcdir)/../shared/kmod_noop.c \
-		$(srcdir)/../shared/agp_noop.c
+		$(srcdir)/../shared/agp_noop.c \
+		$(srcdir)/../shared/at_scancode.c
 
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
 INCLUDES = $(XORG_INCS)
 all: all-am
 
@@ -603,7 +606,10 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VTsw_noop.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/agp_noop.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at_scancode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_init.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_kbd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_mmap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_mouse.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_video.Plo@am__quote@
@@ -699,6 +705,13 @@ agp_noop.lo: $(srcdir)/../shared/agp_noop.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o agp_noop.lo `test -f '$(srcdir)/../shared/agp_noop.c' || echo '$(srcdir)/'`$(srcdir)/../shared/agp_noop.c
 
+at_scancode.lo: $(srcdir)/../shared/at_scancode.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT at_scancode.lo -MD -MP -MF "$(DEPDIR)/at_scancode.Tpo" -c -o at_scancode.lo `test -f '$(srcdir)/../shared/at_scancode.c' || echo '$(srcdir)/'`$(srcdir)/../shared/at_scancode.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/at_scancode.Tpo" "$(DEPDIR)/at_scancode.Plo"; else rm -f "$(DEPDIR)/at_scancode.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../shared/at_scancode.c' object='at_scancode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o at_scancode.lo `test -f '$(srcdir)/../shared/at_scancode.c' || echo '$(srcdir)/'`$(srcdir)/../shared/at_scancode.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/xserver/hw/xfree86/os-support/linux/Makefile.in b/xserver/hw/xfree86/os-support/linux/Makefile.in
index e646056f7..bc1e99211 100644
--- a/xserver/hw/xfree86/os-support/linux/Makefile.in
+++ b/xserver/hw/xfree86/os-support/linux/Makefile.in
@@ -241,6 +241,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/lynxos/Makefile.in b/xserver/hw/xfree86/os-support/lynxos/Makefile.in
index 2027e5dee..3ef06a04f 100644
--- a/xserver/hw/xfree86/os-support/lynxos/Makefile.in
+++ b/xserver/hw/xfree86/os-support/lynxos/Makefile.in
@@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/misc/Makefile.in b/xserver/hw/xfree86/os-support/misc/Makefile.in
index 1c4d4015d..acddf9c2a 100644
--- a/xserver/hw/xfree86/os-support/misc/Makefile.in
+++ b/xserver/hw/xfree86/os-support/misc/Makefile.in
@@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/sco/Makefile.in b/xserver/hw/xfree86/os-support/sco/Makefile.in
index 9e311e40c..5aed93dd4 100644
--- a/xserver/hw/xfree86/os-support/sco/Makefile.in
+++ b/xserver/hw/xfree86/os-support/sco/Makefile.in
@@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/solaris/Makefile.in b/xserver/hw/xfree86/os-support/solaris/Makefile.in
index 1886b5147..27bc5668f 100644
--- a/xserver/hw/xfree86/os-support/solaris/Makefile.in
+++ b/xserver/hw/xfree86/os-support/solaris/Makefile.in
@@ -258,6 +258,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/sysv/Makefile.in b/xserver/hw/xfree86/os-support/sysv/Makefile.in
index 477391479..b1df88b20 100644
--- a/xserver/hw/xfree86/os-support/sysv/Makefile.in
+++ b/xserver/hw/xfree86/os-support/sysv/Makefile.in
@@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
diff --git a/xserver/hw/xfree86/os-support/usl/Makefile.in b/xserver/hw/xfree86/os-support/usl/Makefile.in
index d59d7eda1..48b324797 100644
--- a/xserver/hw/xfree86/os-support/usl/Makefile.in
+++ b/xserver/hw/xfree86/os-support/usl/Makefile.in
@@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@
 INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@
 KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@
 KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@
+KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@
+KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@
 KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@
 KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@
 KDRIVE_CFLAGS = @KDRIVE_CFLAGS@