drm: Branch 'master'

[email protected] (Rob Herring) Sun, 28 May 2017 14:37:26 +0000 (UTC)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]>
 Android.common.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce9e3ba6e2cc65e1e9e6e05a5f326c4dd25ab2c4
Author: Rob Herring <[email protected]>
Date:   Sun May 28 09:34:13 2017 -0500

    Android: fix missing trailing \
    
    In commit bbe998791d6c ("Android's major/minor/makedev live in
    <sys/sysmacros.h>"), it didn't apply cleanly and I missed the trailing
    \, so add it here.
    
    Signed-off-by: Rob Herring <[email protected]>

diff --git a/Android.common.mk b/Android.common.mk
index 4b5462f6..b45ca10f 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -1,6 +1,6 @@
 # XXX: Consider moving these to config.h analogous to autoconf.
 LOCAL_CFLAGS += \
-	-DMAJOR_IN_SYSMACROS=1
+	-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
--