summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2019-07-19 17:28:10 +1000
committerDave Airlie <airlied@redhat.com>2019-07-19 17:28:38 +1000
commit8ee795625665208589a97972b01790bb04ea83e3 (patch)
treeb181d0952c23dbf4fe5b293e778424bad271bbfb /drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
parent9fb7dc73b923ef5e9251ee7c58239a790720904c (diff)
parent4d352dbd5850bfc752609d46b5c8403ae0bd5163 (diff)
downloadlinux-stable-8ee795625665208589a97972b01790bb04ea83e3.tar.gz
linux-stable-8ee795625665208589a97972b01790bb04ea83e3.tar.bz2
linux-stable-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/bar/priv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
index 01ba5b26666e..869ad184f923 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
#ifndef __NVKM_BAR_PRIV_H__
#define __NVKM_BAR_PRIV_H__
#define nvkm_bar(p) container_of((p), struct nvkm_bar, subdev)