diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-23 08:15:55 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-23 08:15:55 +0100 |
| commit | 628d4c46eef4fabe3ddbe07698577162c1cd5d41 (patch) | |
| tree | 5e89f3deafd44c8b81543540c573af0c16dbb427 /drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild | |
| parent | 1e797f556c616a42f1e039b1ff1d3c58f61b6104 (diff) | |
| parent | 65d1086c44791112188f6aebbdc3a27cab3736d3 (diff) | |
| download | linux-628d4c46eef4fabe3ddbe07698577162c1cd5d41.tar.bz2 | |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next
Resync with drm-next, I have a patch which currently can't be applied
because drm-misc-next lacked the latest drm/i915 code.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild new file mode 100644 index 000000000000..4b17254cfbd0 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild @@ -0,0 +1,2 @@ +nvkm-y += nvkm/engine/sec2/base.o +nvkm-y += nvkm/engine/sec2/gp102.o |