diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-04-23 11:38:56 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-04-23 11:38:56 +0000 |
| commit | 58eae96e21109b3905c26645c3fdfda035ca6923 (patch) | |
| tree | 4765581e37fff90ee676b752d75f77debe5dda4c | |
| parent | f699b46f6cdb55991dafe9eca8356ec63010ff16 (diff) | |
Linux code expects to find struct file in fs.h so include sys/file.h
there. As sys/file.h does not have an include guard don't include it in
drm_linux.c which indirectly includes fs.h via drmP.h.
| -rw-r--r-- | sys/dev/pci/drm/drm_linux.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/drm/include/linux/fs.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c index 67601801ea9..f64e3dd4a64 100644 --- a/sys/dev/pci/drm/drm_linux.c +++ b/sys/dev/pci/drm/drm_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_linux.c,v 1.33 2019/04/14 10:14:51 jsg Exp $ */ +/* $OpenBSD: drm_linux.c,v 1.34 2019/04/23 11:38:55 jsg Exp $ */ /* * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org> * Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org> @@ -19,7 +19,6 @@ #include <drm/drmP.h> #include <dev/pci/ppbreg.h> #include <sys/event.h> -#include <sys/file.h> #include <sys/filedesc.h> #include <sys/stat.h> #include <sys/unistd.h> diff --git a/sys/dev/pci/drm/include/linux/fs.h b/sys/dev/pci/drm/include/linux/fs.h index 42d5e95178a..19ca23adc33 100644 --- a/sys/dev/pci/drm/include/linux/fs.h +++ b/sys/dev/pci/drm/include/linux/fs.h @@ -5,6 +5,7 @@ #include <sys/types.h> #include <sys/fcntl.h> +#include <sys/file.h> #include <linux/capability.h> #include <linux/linkage.h> #include <linux/uuid.h> |