summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/devinit
diff options
context:
space:
mode:
authorBen Skeggs2015-08-20 06:54:06 +0200
committerBen Skeggs2015-08-28 04:40:07 +0200
commit9ace404b1098221021b01c2ba0eeea0c257fa4a5 (patch)
tree7aae574960fc5d5838502cc98d79dc904d5c3b84 /drivers/gpu/drm/nouveau/nvkm/subdev/devinit
parentdrm/nouveau/device: add direct pointer to struct device (diff)
downloadkernel-qcow2-linux-9ace404b1098221021b01c2ba0eeea0c257fa4a5.tar.gz
kernel-qcow2-linux-9ace404b1098221021b01c2ba0eeea0c257fa4a5.tar.xz
kernel-qcow2-linux-9ace404b1098221021b01c2ba0eeea0c257fa4a5.zip
drm/nouveau/device: include core/device.h automatically for subdevs/engines
Pretty much every subdev/engine is going to need access to nvkm_device shortly to touch registers and/or output messages. The odd placement of the includes is necessary to work around some inter-dependencies that currently exist. This will be fixed later. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/devinit')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c1
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
index b0d7c5f40db1..5cc7dd24a213 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
@@ -23,7 +23,6 @@
*/
#include "priv.h"
-#include <core/device.h>
#include <core/option.h>
#include <subdev/vga.h>
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
index 36684c3f9e9c..4e484c40b5c6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
@@ -23,7 +23,6 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-#include <core/device.h>
#include <subdev/fb/regsnv04.h>
#define NV04_PFB_DEBUG_0 0x00100080