OSDN Git Service

Merge commit 'origin/master' into modesetting-gem
[android-x86/external-libdrm.git] / linux-core / Makefile.kernel
index d3668df..b09697d 100644 (file)
@@ -21,10 +21,11 @@ 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
 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 i915_execbuf.o i915_gem.o \
+               i915_buffer.o i915_compat.o i915_execbuf.o i915_suspend.o \
+               i915_gem.o i915_opregion.o \
                intel_display.o intel_crt.o intel_lvds.o intel_bios.o \
                intel_sdvo.o intel_modes.o intel_i2c.o i915_init.o intel_fb.o \
-               intel_tv.o i915_compat.o intel_dvo.o dvo_ch7xxx.o \
+               intel_tv.o intel_dvo.o dvo_ch7xxx.o \
                dvo_ch7017.o dvo_ivch.o dvo_tfp410.o dvo_sil164.o
 nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
                nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \