diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-19 09:28:10 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-19 09:28:38 +0200 |
| commit | 8ee795625665208589a97972b01790bb04ea83e3 (patch) | |
| tree | b181d0952c23dbf4fe5b293e778424bad271bbfb /drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h | |
| parent | Merge tag 'drm-next-5.3-2019-07-18' of git://people.freedesktop.org/~agd5f/li... (diff) | |
| parent | drm/nouveau/secboot/gp102-: remove WAR for SEC2 RTOS start bug (diff) | |
| download | linux-8ee795625665208589a97972b01790bb04ea83e3.tar.xz linux-8ee795625665208589a97972b01790bb04ea83e3.zip | |
Merge branch 'linux-5.3' of git://github.com/skeggsb/linux into drm-next
nouveau fixes and TU116 enablement.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5hZ3B4S9cVTPd2-Ug7dMSasLPJrWMyoDo4MOg8cbXWkA@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h index 1a8ad560321b..75f13a34671f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ #ifndef __NVKM_VOLT_PRIV_H__ #define __NVKM_VOLT_PRIV_H__ #define nvkm_volt(p) container_of((p), struct nvkm_volt, subdev) |