diff options
authorDan Nicholson <>2010-02-10 15:36:44 +1000
committerPeter Hutterer <>2010-02-11 19:25:10 +1000
commit67bc278a511ca6ec42e1f8d2d5897c0109e94e2c (patch)
parenta34812b09000db2ff2a1dc6182602839123edd4e (diff)
xfree86: Make InputClass docs and comments match reality
Drivers and options specified in InputClass sections work on a "first match wins" strategy. Let's be consistent when documenting it. Signed-off-by: Dan Nicholson <> Reviewed-by: Peter Hutterer <> Signed-off-by: Peter Hutterer <>
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index fb0ee9c3f..6cbc23e36 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -538,9 +538,9 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
- * Merge in any InputClass configurations. Each InputClass section can
- * add to the original device configuration as well as any previous
- * InputClass sections.
+ * Merge in any InputClass configurations. Options in each InputClass
+ * section have less priority than the original device configuration as
+ * well as any previous InputClass sections.
static int
MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
diff --git a/hw/xfree86/doc/man/ b/hw/xfree86/doc/man/
index 222530b41..baabdb59f 100644
--- a/hw/xfree86/doc/man/
+++ b/hw/xfree86/doc/man/
@@ -1021,7 +1021,7 @@ The
entry specifies the name of the driver to use for this input device.
After all classes have been examined, the
.RI \*q inputdriver \*q
-module from the final
+module from the first
.B Driver
entry will be enabled when using the loadable server.