diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-10 10:45:55 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-10 10:45:55 -0700 |
| commit | 44a8761302888080f1cb6596d4573d88c1746da4 (patch) | |
| tree | 851220ca0bdcd7677eda5ea796a4eb5a670bf406 /linux-core/Makefile.kernel | |
| parent | e114b981bc291049fa6996d487334a408acc1ce2 (diff) | |
| parent | 50672adb3142abca743535a8e60c360ef47b2a08 (diff) | |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts:
linux-core/drm_crtc.c - trivial merge
linux-core/drm_crtc.h - trivial merge
linux-core/intel_display.c - crtc_config -> mode_config
shared-core/i915_dma.c - accommodate new init code in i915_init.c
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 ac403f64..c767116a 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -21,7 +21,7 @@ mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \ i915_buffer.o intel_display.o intel_crt.o intel_lvds.o \ - intel_sdvo.o intel_modes.o intel_i2c.o + intel_sdvo.o intel_modes.o intel_i2c.o i915_init.o nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ nouveau_object.o nouveau_irq.o \ nv04_timer.o \ |