diff options
author | marha <marha@users.sourceforge.net> | 2012-09-05 15:53:43 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-05 15:53:43 +0200 |
commit | 50fad5cd2be4cd105c99687e224da60233f81645 (patch) | |
tree | 37953f7b833a0ee31628e1301bb04be16238e6e2 /xorg-server/config | |
parent | 67c4614f29188e4af86e1d88ee82759c896b70b5 (diff) | |
download | vcxsrv-50fad5cd2be4cd105c99687e224da60233f81645.tar.gz vcxsrv-50fad5cd2be4cd105c99687e224da60233f81645.tar.bz2 vcxsrv-50fad5cd2be4cd105c99687e224da60233f81645.zip |
xserver mesa git update 4 sep 2012
Diffstat (limited to 'xorg-server/config')
-rw-r--r-- | xorg-server/config/udev.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c index 03aca2854..c2d00bbda 100644 --- a/xorg-server/config/udev.c +++ b/xorg-server/config/udev.c @@ -339,7 +339,7 @@ config_udev_pre_init(void) #endif #ifdef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG - if (SeatId && strcmp(SeatId, "seat0")) + if (ServerIsNotSeat0()) udev_monitor_filter_add_match_tag(udev_monitor, SeatId); #endif if (udev_monitor_enable_receiving(udev_monitor)) { @@ -368,7 +368,7 @@ config_udev_init(void) #endif #ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG - if (SeatId && strcmp(SeatId, "seat0")) + if (ServerIsNotSeat0()) udev_enumerate_add_match_tag(enumerate, SeatId); #endif @@ -454,6 +454,10 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback) udev_enumerate_add_match_subsystem(enumerate, "drm"); udev_enumerate_add_match_sysname(enumerate, "card[0-9]*"); +#ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG + if (ServerIsNotSeat0()) + udev_enumerate_add_match_tag(enumerate, SeatId); +#endif udev_enumerate_scan_devices(enumerate); devices = udev_enumerate_get_list_entry(enumerate); udev_list_entry_foreach(device, devices) { |