drm: Branch 'master'

 xf86drmMode.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 00aa37443f32ff22e439093bc4039c21c74d0d2e
Author: Eric Engestrom <[email protected]>
Date:   Thu Mar 22 17:08:37 2018 +0000

    xf86drmMode: merge successive mutually-exclusive #ifs
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Frank Binns <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/xf86drmMode.c b/xf86drmMode.c
index cf8e1eac..9a15b5e7 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -827,8 +827,7 @@ int drmCheckModesettingSupported(const char *busid)
 	}
 #elif defined(__DragonFly__)
 	return 0;
-#endif
-#ifdef __OpenBSD__
+#elif defined(__OpenBSD__)
 	int	fd;
 	struct drm_mode_card_res res;
 	drmModeResPtr r = 0;

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--