From 0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 2 Apr 2010 13:46:21 +0000 Subject: svn merge -r522:HEAD ^/branches/released . --- xorg-server/hw/kdrive/linux/Makefile.in | 2 ++ xorg-server/hw/kdrive/linux/evdev.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'xorg-server/hw/kdrive/linux') diff --git a/xorg-server/hw/kdrive/linux/Makefile.in b/xorg-server/hw/kdrive/linux/Makefile.in index e0598dcb7..abfb657cf 100644 --- a/xorg-server/hw/kdrive/linux/Makefile.in +++ b/xorg-server/hw/kdrive/linux/Makefile.in @@ -111,6 +111,7 @@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AR = @AR@ +ARM_BACKTRACE_CFLAGS = @ARM_BACKTRACE_CFLAGS@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -298,6 +299,7 @@ XDMX_SYS_LIBS = @XDMX_SYS_LIBS@ XEPHYR_CFLAGS = @XEPHYR_CFLAGS@ XEPHYR_INCS = @XEPHYR_INCS@ XEPHYR_LIBS = @XEPHYR_LIBS@ +XF86CONFIGDIR = @XF86CONFIGDIR@ XF86CONFIGFILE = @XF86CONFIGFILE@ XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@ XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@ diff --git a/xorg-server/hw/kdrive/linux/evdev.c b/xorg-server/hw/kdrive/linux/evdev.c index 485a2b557..0e4c9f735 100644 --- a/xorg-server/hw/kdrive/linux/evdev.c +++ b/xorg-server/hw/kdrive/linux/evdev.c @@ -362,7 +362,7 @@ readMapping (KdKeyboardInfo *ki) return; ki->minScanCode = 0; - ki->maxScanCode = 193; + ki->maxScanCode = 247; } static void -- cgit v1.2.3