diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
commit | 9adf8c02563b1e6110e46dabd733e2dc440b4200 (patch) | |
tree | 7a0e360dc9663b3e269a5d5e164672bf8885a5e4 /linux-core/Makefile.kernel | |
parent | d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5 (diff) | |
parent | b9d9c30474238ac8ba4899a19fe4a97e9376f6c4 (diff) |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_bo.c
linux-core/drm_objects.h
Diffstat (limited to 'linux-core/Makefile.kernel')
-rw-r--r-- | linux-core/Makefile.kernel | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index 6cbe3a27..457e3f3c 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -14,7 +14,7 @@ drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ drm_memory_debug.o ati_pcigart.o drm_sman.o \ drm_hashtab.o drm_mm.o drm_object.o drm_compat.o \ drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_crtc.o \ - drm_edid.o drm_modes.o + drm_edid.o drm_modes.o drm_bo_lock.o tdfx-objs := tdfx_drv.o r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o |