git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
include
/
nvkm
/
core
/
device.h
diff --git
a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index d7ecb65ba19f62c85f4fc8c1c9aa29f64fa1cdea..560265b15ec23705decabcfec7491c4f47f09f4b 100644
(file)
--- a/
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@
-1,8
+1,8
@@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __NVKM_DEVICE_H__
#define __NVKM_DEVICE_H__
+#include <core/oclass.h>
#include <core/event.h>
-#include <core/object.h>
enum nvkm_devidx {
NVKM_SUBDEV_PCI,