drm: Branch 'master'

[email protected] (Rob Herring) Sun, 28 May 2017 14:31:35 +0000 (UTC)

Newsgroups	gmane.comp.video.dri.patches
Message-ID	<[email protected]>

 Android.common.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit bbe998791d6cd0d5c048beba6ae8a6dbbf8185be
Author: Elliott Hughes <[email protected]>
Date:   Sat May 20 11:24:29 2017 -0700

    Android's major/minor/makedev live in <sys/sysmacros.h>
    
    Bug: https://github.com/android-ndk/ndk/issues/398
    
    Signed-off-by: Rob Herring <[email protected]>

diff --git a/Android.common.mk b/Android.common.mk
index 35c0f02c..4b5462f6 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -1,5 +1,6 @@
 # XXX: Consider moving these to config.h analogous to autoconf.
 LOCAL_CFLAGS += \
+	-DMAJOR_IN_SYSMACROS=1
 	-DHAVE_VISIBILITY=1 \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 

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