summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-07-14 14:01:46 +0200
committerKeith Packard <keithp@keithp.com>2014-07-14 13:18:15 -0700
commit25eca7ce35973577c8d85704c270f7fb53e6732e (patch)
tree9f30744b0d5c2176e7f4e6276c1711d82e378b4a /include
parent9a19bf06b5b409fa0d5b5932e29cd4c5545052c5 (diff)
downloadxserver-25eca7ce35973577c8d85704c270f7fb53e6732e.tar.gz
Fix ODEV_ATTRIB_DRIVER overlapping with ODEV_ATTRIB_FD
Looks like the value of ODEV_ATTRIB_DRIVER was not updated when the patch adding it got rebased on top of a newer server version. This fixes the xserver crashing when systemd-logind integration is used. https://bugzilla.redhat.com/show_bug.cgi?id=1118540 Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
-rw-r--r--include/hotplug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hotplug.h b/include/hotplug.h
index c4268a0c4..b2c0d78a5 100644
--- a/include/hotplug.h
+++ b/include/hotplug.h
@@ -88,7 +88,7 @@ config_odev_free_attributes(struct OdevAttributes *attribs);
/* Minor number of the device node pointed to by ODEV_ATTRIB_PATH */
#define ODEV_ATTRIB_MINOR 6
/* kernel driver name */
-#define ODEV_ATTRIB_DRIVER 4
+#define ODEV_ATTRIB_DRIVER 7
typedef void (*config_odev_probe_proc_ptr)(struct OdevAttributes *attribs);
void config_odev_probe(config_odev_probe_proc_ptr probe_callback);