summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-08-06 17:24:25 +1000
committerDave Airlie <airlied@gmail.com>2014-08-06 19:10:44 +1000
commit21d70354bba9965a098382fc4d7fb17e138111f3 (patch)
tree98aa590aa55a39a1a426ea465150534d78216534 /drivers/gpu
parentacf8294fecd4b805b408d02c321a0fd7eef95555 (diff)
downloadlinux-21d70354bba9965a098382fc4d7fb17e138111f3.tar.gz
linux-21d70354bba9965a098382fc4d7fb17e138111f3.tar.bz2
linux-21d70354bba9965a098382fc4d7fb17e138111f3.zip
drm: move drm_stub.c to drm_drv.c
Everyone agrees we should do this, Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/Makefile2
-rw-r--r--drivers/gpu/drm/drm_drv.c (renamed from drivers/gpu/drm/drm_stub.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 1f6f40cecf5c..4a55d59ccd22 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -7,7 +7,7 @@ ccflags-y := -Iinclude/drm
drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
drm_context.o drm_dma.o \
drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
- drm_lock.o drm_memory.o drm_stub.o drm_vm.o \
+ drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
drm_agpsupport.o drm_scatter.o drm_pci.o \
drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
drm_crtc.o drm_modes.o drm_edid.o \
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_drv.c
index 92bc6b1d9646..92bc6b1d9646 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_drv.c