drm: Branch 'master' - 2 commits

 .editorconfig |   19 +++++++++++++++++++
 xf86drm.c     |    4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 885624b0b9691562cdc019182985605a84042e5c
Author: Thierry Reding <[email protected]>
Date:   Wed Dec 21 18:08:29 2016 +0100

    Add .editorconfig
    
    This encodes the indentation style for libdrm and can be used with
    various editors. See http://editorconfig.org for instructions.
    
    Reviewed-by: Emil Velikov <[email protected]>
    Signed-off-by: Thierry Reding <[email protected]>

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..893b7be
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# To use this config with your editor, follow the instructions at:
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+
+[*.{c,h}]
+indent_style = space
+indent_size = 4
+
+[{Makefile.*,*.mk}]
+indent_style = tab
+
+[*.m4]
+indent_style = space
+indent_size = 2
commit e17cad1994d321a8279c124e7a85ddddcdd9e4cd
Author: Thierry Reding <[email protected]>
Date:   Wed Dec 21 18:00:52 2016 +0100

    xf86drm: Fix indentation
    
    libdrm uses spaces for indentation. Fix the two inconsistent lines in
    this file.
    
    Reviewed-by: Emil Velikov <[email protected]>
    Signed-off-by: Thierry Reding <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 7d7df18..b8b2cfe 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -2908,7 +2908,7 @@ static int drmParseSubsystemType(int maj, int min)
 
     return -EINVAL;
 #elif defined(__OpenBSD__)
-	return DRM_BUS_PCI;
+    return DRM_BUS_PCI;
 #else
 #warning "Missing implementation of drmParseSubsystemType"
     return -EINVAL;
@@ -3419,7 +3419,7 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device)
     closedir(sysdir);
     free(local_devices);
     if (*device == NULL)
-	return -ENODEV;
+        return -ENODEV;
     return 0;
 
 free_devices:

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
--