diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-06 17:21:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-06 17:21:13 +1000 |
| commit | acf8294fecd4b805b408d02c321a0fd7eef95555 (patch) | |
| tree | 1bf751f65495b72c626b5318fc33adbb1f7b5979 /drivers/gpu/drm/Makefile | |
| parent | 5b215bcff50d549d73e43c09bcccf8eebcc95bac (diff) | |
| parent | e7b96070dd9e51a8b16340411a8643d8c7d5a001 (diff) | |
| download | linux-acf8294fecd4b805b408d02c321a0fd7eef95555.tar.bz2 | |
Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
bunch of cleanups
* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
drm: mark drm_context support as legacy
drm: make sysfs device always available for minors
drm: make minor->index available early
drm: merge drm_drv.c into drm_ioctl.c
drm: move module initialization to drm_stub.c
drm: don't de-authenticate clients on master-close
drm: drop redundant drm_file->is_master
drm: extract legacy ctxbitmap flushing
Diffstat (limited to 'drivers/gpu/drm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 60eb5d425df2..1f6f40cecf5c 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -6,7 +6,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_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.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_agpsupport.o drm_scatter.o drm_pci.o \ drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \ |