diff options
author | David S. Miller <davem@davemloft.net> | 2010-03-16 00:23:54 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-16 00:23:54 +0100 |
commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /drivers/gpu/drm/Makefile | |
parent | net-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation (diff) | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
download | linux-4961e02f1999e1c3468c09b2669c94d7c3ae82a8.tar.xz linux-4961e02f1999e1c3468c09b2669c94d7c3ae82a8.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 39c5aa75b8f1..abe3f446ca48 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -4,7 +4,7 @@ ccflags-y := -Iinclude/drm -drm-y := drm_auth.o drm_bufs.o drm_cache.o \ +drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ drm_context.o drm_dma.o drm_drawable.o \ drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ |