summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Dasmohapatra <vivek@collabora.co.uk>2013-02-21 15:13:08 (GMT)
committerVivek Dasmohapatra <vivek@collabora.co.uk>2013-03-04 17:56:20 (GMT)
commitfc01c62f0d83468edddfd50c45b3e9cca48a217e (patch)
treebf23b1c578a2a28f0793952be38e87e26237dff7
parentd9a0a3eb125d776ba342cc8382542604891b42af (diff)
downloadi915-3.6-3.5-ubuntu-fc01c62f0d83468edddfd50c45b3e9cca48a217e.tar.gz
i915-3.6-3.5-ubuntu-fc01c62f0d83468edddfd50c45b3e9cca48a217e.tar.xz
Amend includes to eliminate a few stubborn shipped vs native header bugs
-rw-r--r--drivers/gpu/drm/drm_buffer.c1
-rw-r--r--drivers/gpu/drm/drm_cache.c2
-rw-r--r--drivers/gpu/drm/drm_context.c2
-rw-r--r--drivers/gpu/drm/drm_encoder_slave.c2
-rw-r--r--drivers/gpu/drm/drm_pci.c3
-rw-r--r--drivers/platform/x86/intel_ips.c2
-rw-r--r--include/drm/drmP.h1
7 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c
index 17ad300..2f3da80 100644
--- a/drivers/gpu/drm/drm_buffer.c
+++ b/drivers/gpu/drm/drm_buffer.c
@@ -32,6 +32,7 @@
* Pauli Nieminen <suokkos-at-gmail-dot-com>
*/
+#include "drmP.h"
#include <linux/export.h>
#include "drm_buffer.h"
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 08758e0..d2eaabd 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -31,6 +31,8 @@
#include <linux/export.h>
#include "drmP.h"
+#include "backport-check.h"
+
#if defined(CONFIG_X86)
static void
drm_clflush_page(struct page *page)
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index affa629..b1dfa9d 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
@@ -42,6 +42,8 @@
#include "drmP.h"
+#include "backport-check.h"
+
/******************************************************************/
/** \name Context bitmap support */
/*@{*/
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index 5ff9f4c..cf74e5e 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -25,7 +25,7 @@
*/
#include <linux/module.h>
-
+#include "drmP.h"
#include "drm_encoder_slave.h"
#include "backport-check.h"
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index a4cf26a..5ae7f87 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -36,11 +36,12 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "drmP.h"
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/dma-mapping.h>
#include <linux/export.h>
-#include "drmP.h"
+
#include "backport-check.h"
/**********************************************************************/
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index c2ab6d0..1a38a38 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -59,6 +59,8 @@
* - ref 26489 - Nehalem BIOS writer's guide
* - ref 26921 - Ibex Peak BIOS Specification
*/
+#include "pci_regs.h"
+#include "i915_drm.h"
#include <linux/debugfs.h>
#include <linux/delay.h>
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 21af9a3..bd69900 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -36,6 +36,7 @@
#define _DRM_P_H_
#define DRMP_36_35_BACKPORT
+#include "pci_regs.h"
#ifdef __KERNEL__
#ifdef __alpha__