aboutsummaryrefslogtreecommitdiff
path: root/linux-core/Makefile.kernel
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-05-08 10:25:01 +1000
committerDave Airlie <airlied@linux.ie>2008-05-08 10:25:01 +1000
commitef204fb5c24f9bd09192a9abebad6a06dd0b88db (patch)
treea72ee9071462457b27475c2cc86e3c6256388ea9 /linux-core/Makefile.kernel
parent7f269bec7ed49385de394fdbd970f463ef2060f0 (diff)
parentb44f2da380e78769b58c751e81f376f0fa1f48aa (diff)
Merge remote branch 'origin/master' into modesetting-101
Conflicts: linux-core/Makefile.kernel shared-core/i915_drv.h
Diffstat (limited to 'linux-core/Makefile.kernel')
-rw-r--r--linux-core/Makefile.kernel3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 6903ec63..a805859b 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -14,7 +14,8 @@ 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_bo_lock.o drm_regman.o
+ drm_edid.o drm_modes.o drm_bo_lock.o drm_regman.o \
+ drm_vm_nopage-compat.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