drm/i915: Clean up Makefile

Sorting became confused and a few new files ended up in strange
places. Also move i915_irq.c to core since with the recent-ish
extraction of i915_gpu_error.c and intel_hotplug.c it's more and more
really just basic irq handling code.

When adding new files please don't put them somewhere randomly.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index e52e0125164450ad7f1e2dea841000b7a24c94bb..bf91482e14a33f4cc80a70e101a137c788f17b1a 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -6,12 +6,13 @@
 
 # core driver code
 i915-y := i915_drv.o \
+         i915_irq.o \
          i915_params.o \
           i915_suspend.o \
          i915_sysfs.o \
+         intel_csr.o \
          intel_pm.o \
-         intel_runtime_pm.o \
-         intel_csr.o
+         intel_runtime_pm.o
 
 i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
@@ -20,21 +21,19 @@ i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
 i915-y += i915_cmd_parser.o \
          i915_gem_batch_pool.o \
          i915_gem_context.o \
-         i915_gem_render_state.o \
          i915_gem_debug.o \
          i915_gem_dmabuf.o \
          i915_gem_evict.o \
          i915_gem_execbuffer.o \
          i915_gem_gtt.o \
          i915_gem.o \
+         i915_gem_render_state.o \
          i915_gem_shrinker.o \
          i915_gem_stolen.o \
          i915_gem_tiling.o \
          i915_gem_userptr.o \
          i915_gpu_error.o \
-         i915_irq.o \
          i915_trace_points.o \
-         intel_hotplug.o \
          intel_lrc.o \
          intel_mocs.o \
          intel_ringbuffer.o \
@@ -48,11 +47,14 @@ i915-y += intel_renderstate_gen6.o \
 
 # modesetting core code
 i915-y += intel_audio.o \
+         intel_atomic.o \
+         intel_atomic_plane.o \
          intel_bios.o \
          intel_display.o \
          intel_fbc.o \
          intel_fifo_underrun.o \
          intel_frontbuffer.o \
+         intel_hotplug.o \
          intel_modes.o \
          intel_overlay.o \
          intel_psr.o \
@@ -68,15 +70,13 @@ i915-y += dvo_ch7017.o \
          dvo_ns2501.o \
          dvo_sil164.o \
          dvo_tfp410.o \
-         intel_atomic.o \
-         intel_atomic_plane.o \
          intel_crt.o \
          intel_ddi.o \
-         intel_dp.o \
          intel_dp_mst.o \
+         intel_dp.o \
          intel_dsi.o \
-         intel_dsi_pll.o \
          intel_dsi_panel_vbt.o \
+         intel_dsi_pll.o \
          intel_dvo.o \
          intel_hdmi.o \
          intel_i2c.o \