diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/i915/Makefile | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/i915/Makefile')
-rw-r--r-- | drivers/gpu/drm/i915/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 5c8e53458edb..0ae6a7c5020f 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile | |||
@@ -9,6 +9,8 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ | |||
9 | i915_gem.o \ | 9 | i915_gem.o \ |
10 | i915_gem_debug.o \ | 10 | i915_gem_debug.o \ |
11 | i915_gem_evict.o \ | 11 | i915_gem_evict.o \ |
12 | i915_gem_execbuffer.o \ | ||
13 | i915_gem_gtt.o \ | ||
12 | i915_gem_tiling.o \ | 14 | i915_gem_tiling.o \ |
13 | i915_trace_points.o \ | 15 | i915_trace_points.o \ |
14 | intel_display.o \ | 16 | intel_display.o \ |
@@ -26,15 +28,17 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ | |||
26 | intel_dvo.o \ | 28 | intel_dvo.o \ |
27 | intel_ringbuffer.o \ | 29 | intel_ringbuffer.o \ |
28 | intel_overlay.o \ | 30 | intel_overlay.o \ |
31 | intel_opregion.o \ | ||
29 | dvo_ch7xxx.o \ | 32 | dvo_ch7xxx.o \ |
30 | dvo_ch7017.o \ | 33 | dvo_ch7017.o \ |
31 | dvo_ivch.o \ | 34 | dvo_ivch.o \ |
32 | dvo_tfp410.o \ | 35 | dvo_tfp410.o \ |
33 | dvo_sil164.o | 36 | dvo_sil164.o |
34 | 37 | ||
35 | i915-$(CONFIG_ACPI) += i915_opregion.o | ||
36 | i915-$(CONFIG_COMPAT) += i915_ioc32.o | 38 | i915-$(CONFIG_COMPAT) += i915_ioc32.o |
37 | 39 | ||
40 | i915-$(CONFIG_ACPI) += intel_acpi.o | ||
41 | |||
38 | obj-$(CONFIG_DRM_I915) += i915.o | 42 | obj-$(CONFIG_DRM_I915) += i915.o |
39 | 43 | ||
40 | CFLAGS_i915_trace_points.o := -I$(src) | 44 | CFLAGS_i915_trace_points.o := -I$(src) |