From f69a27bcd38e44d9aa3df9c7c159c85ad90817ad Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <reinauer@chromium.org>
Date: Tue, 6 Jan 2015 13:08:23 -0800
Subject: device: drop i915 specific headers from resource allocator includes

src/include/device/ is the place for include files of the resource
allocator. Hence, drop the i915 include file copies and use the ones
supplied with the i915 driver instead. The only remaining user of this
was the Intel Whitetip Mountain 2 reference board, all other occurences
have been previously fixed already.

Change-Id: Ib9f72df4e8f847597508971e9dbf671f49019767
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/8140
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/mainboard/intel/wtm2/graphics.c | 2 +-
 src/mainboard/intel/wtm2/i915.c     | 2 +-
 src/mainboard/intel/wtm2/intel_dp.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mainboard/intel/wtm2')

diff --git a/src/mainboard/intel/wtm2/graphics.c b/src/mainboard/intel/wtm2/graphics.c
index f0f2fcfff7..436ab792c0 100644
--- a/src/mainboard/intel/wtm2/graphics.c
+++ b/src/mainboard/intel/wtm2/graphics.c
@@ -20,7 +20,7 @@
  * will be all machine generated. Avoid editing.
  */
 #include <console/console.h>
-#include <device/i915.h>
+#include <drivers/intel/gma/i915.h>
 
 void graphics_register_reset(u32 aux_ctl, u32 aux_data, int verbose)
 {
diff --git a/src/mainboard/intel/wtm2/i915.c b/src/mainboard/intel/wtm2/i915.c
index f542a13574..72957a0de4 100644
--- a/src/mainboard/intel/wtm2/i915.c
+++ b/src/mainboard/intel/wtm2/i915.c
@@ -41,7 +41,7 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
 #include <edid.h>
-#include <device/i915.h>
+#include <drivers/intel/gma/i915.h>
 
 /* how many bytes do we need for the framebuffer?
  * Well, this gets messy. To get an exact answer, we have
diff --git a/src/mainboard/intel/wtm2/intel_dp.c b/src/mainboard/intel/wtm2/intel_dp.c
index e7222a3f2b..b38994622f 100644
--- a/src/mainboard/intel/wtm2/intel_dp.c
+++ b/src/mainboard/intel/wtm2/intel_dp.c
@@ -30,7 +30,7 @@
 #include <console/console.h>
 #include <stdint.h>
 #include <delay.h>
-#include <device/i915.h>
+#include <drivers/intel/gma/i915.h>
 
 u32
 pack_aux(u32 *src32, int src_bytes)
-- 
cgit v1.2.3