aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/common/xf86Config.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-10 07:43:34 +0000
committermarha <marha@users.sourceforge.net>2009-12-10 07:43:34 +0000
commit0540eb5a1f795c0f5265d244ec979b8ddfcf3acb (patch)
tree06c5c3f4394f2d6d48c95ed1bfbab3a44e9996cc /xorg-server/hw/xfree86/common/xf86Config.c
parent5c72c54bc068bf12007dc15b353b1b2795e9aaf5 (diff)
parent75d2bbcf0f39b9c85bc270728343f61dabebce2d (diff)
downloadvcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.gz
vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.bz2
vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.zip
svn merge ^/trunk .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Config.c')
-rw-r--r--xorg-server/hw/xfree86/common/xf86Config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 40f65bdbf..e1283f97f 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1456,7 +1456,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
#ifdef CONFIG_HAL
xf86Msg(X_INFO, "The server relies on HAL to provide the list of "
"input devices.\n\tIf no devices become available, "
- "reconfigure HAL or disable AllowEmptyInput.\n");
+ "reconfigure HAL or disable AutoAddDevices.\n");
#else
xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n"
"\tTry disabling AllowEmptyInput.\n");