Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 01:54:43 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/include/uapi/drm: drm.h

Log Message:
Make sure we don't end up on the wrong side of this ifdef.

We have our own block in this file and don't want two differing
declarations of drm_handle_t.

Author: Maya Rashish <m...@netbsd.org>


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
    src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h
diff -u src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.5 src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.6
--- src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.5	Sun Dec 19 01:53:57 2021
+++ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h	Sun Dec 19 01:54:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm.h,v 1.5 2021/12/19 01:53:57 riastradh Exp $	*/
+/*	$NetBSD: drm.h,v 1.6 2021/12/19 01:54:43 riastradh Exp $	*/
 
 /**
  * \file drm.h
@@ -38,7 +38,7 @@
 #ifndef _DRM_H_
 #define _DRM_H_
 
-#if defined(__KERNEL__)
+#if defined(__linux__) && defined(__KERNEL__)
 
 #include <linux/types.h>
 #include <asm/ioctl.h>

Reply via email to