diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-02-07 17:47:43 -0800 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-02-07 17:47:43 -0800 |
| commit | c0f00d270eba3cba688dd62a7b1a742ad289b879 (patch) | |
| tree | cea3939f9834a67d1fce2d9e74d5125f56167639 /drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | |
| parent | 5ba32c7be81e53ea8a27190b0f6be98e6c6779af (diff) | |
| parent | 9f880327160feb695de03caa29604883b0d00087 (diff) | |
| download | linux-c0f00d270eba3cba688dd62a7b1a742ad289b879.tar.bz2 | |
Merge drm/drm-next into drm-intel-next-queued
Moving the base forward since this one was so old.
New base contains fixes that we needed.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h index d8be2f77ac66..54eab5e04230 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h @@ -3,6 +3,7 @@ #define __NVKM_DEVICE_PRIV_H__ #include <core/device.h> +#include <subdev/acr.h> #include <subdev/bar.h> #include <subdev/bios.h> #include <subdev/bus.h> @@ -27,7 +28,6 @@ #include <subdev/timer.h> #include <subdev/top.h> #include <subdev/volt.h> -#include <subdev/secboot.h> #include <engine/bsp.h> #include <engine/ce.h> |