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:51:18 (GMT)
commit674d048aede843cbe5faaae342f4279247045b59 (patch)
tree07471693e630ba70140a59d172cc69b453aa2111
parent1224698411f154695b37345d3f897d8c8df339d8 (diff)
downloadi915-3.6-3.5-ubuntu-674d048aede843cbe5faaae342f4279247045b59.tar.gz
i915-3.6-3.5-ubuntu-674d048aede843cbe5faaae342f4279247045b59.tar.xz
Add #define symbols to allow a check for shipped headers vs native ones
-rw-r--r--include/backport-check.h35
-rw-r--r--include/drm/drm.h2
-rw-r--r--include/drm/drmP.h2
-rw-r--r--include/drm/drm_crtc_helper.h2
-rw-r--r--include/drm/drm_mm.h2
-rw-r--r--include/drm/i915_drm.h2
-rw-r--r--include/linux/pci_regs.h2
7 files changed, 47 insertions, 0 deletions
diff --git a/include/backport-check.h b/include/backport-check.h
new file mode 100644
index 0000000..938126b
--- /dev/null
+++ b/include/backport-check.h
@@ -0,0 +1,35 @@
+#ifdef _DRM_H_
+#ifndef DRM_36_35_BACKPORT
+#error "drm.h NOT FROM BACKPORT"
+#endif
+#endif
+
+#ifdef _DRM_P_H_
+#ifndef DRMP_36_35_BACKPORT
+#error "drmP.h NOT FROM BACKPORT"
+#endif
+#endif
+
+#ifdef __DRM_CRTC_HELPER_H__
+#ifndef DRM_CRTC_HELPER_36_35_BACKPORT
+#error "drm_crtc_helper.h NOT FROM BACKPORT"
+#endif
+#endif
+
+#ifdef _DRM_MM_H_
+#ifndef DRM_MM_36_35_BACKPORT
+#error "drm_mm.h NOT FROM BACKPORT"
+#endif
+#endif
+
+#ifdef _I915_DRM_H_
+#ifndef I915_DRM_36_35_BACKPORT
+#error "i915_drm.h NOT FROM BACKPORT"
+#endif
+#endif
+
+#ifdef LINUX_PCI_REGS_H
+#ifndef LINUX_PCI_REGS_36_35_BACKPORT
+#error "linux/pci_regs.h NOT FROM BACKPORT"
+#endif
+#endif
diff --git a/include/drm/drm.h b/include/drm/drm.h
index e51035a..a847489 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -36,6 +36,8 @@
#ifndef _DRM_H_
#define _DRM_H_
+#define DRM_36_35_BACKPORT
+
#if defined(__linux__)
#include <linux/types.h>
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index d6b67bb..21af9a3 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -35,6 +35,8 @@
#ifndef _DRM_P_H_
#define _DRM_P_H_
+#define DRMP_36_35_BACKPORT
+
#ifdef __KERNEL__
#ifdef __alpha__
/* add include of current.h so that "current" is defined
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index e01cc80..540773f 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -33,6 +33,8 @@
#ifndef __DRM_CRTC_HELPER_H__
#define __DRM_CRTC_HELPER_H__
+#define DRM_CRTC_HELPER_36_35_BACKPORT
+
#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/idr.h>
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index 06d7f79..8513bbe 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -33,6 +33,8 @@
#ifndef _DRM_MM_H_
#define _DRM_MM_H_
+#define DRM_MM_36_35_BACKPORT
+
/*
* Generic range manager structs
*/
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 8cc7083..2918b94 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -27,6 +27,8 @@
#ifndef _I915_DRM_H_
#define _I915_DRM_H_
+#define I915_DRM_36_35_BACKPORT
+
#include "drm.h"
/* Please note that modifications to all structs defined here are
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 7fb75b1..44674bd 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -22,6 +22,8 @@
#ifndef LINUX_PCI_REGS_H
#define LINUX_PCI_REGS_H
+#define LINUX_PCI_REGS_36_35_BACKPORT
+
/*
* Under PCI, each device has 256 bytes of configuration address space,
* of which the first 64 bytes are standardized as follows: