From 8ca0116566d3ad9a2e583dc264b6e29dfc117838 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@starflyer.(none)>
Date: Thu, 12 Jan 2006 20:44:30 +1100
Subject: [PATCH] --- yaml --- r: 18263 b: refs/heads/master c:
 9c7d462eda13ca211b7b4a62f191f4cfda135e2d h: refs/heads/master i:   18261:
 eb48c4005e11dcae2a66b43e890694699ecbc8ef   18259:
 4b13d37fe26ddaf86e2a48f56e3292d4e27225fe   18255:
 9a23728ef11ba7de8291ab8d7a7f77acef653f19 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/char/drm/drmP.h | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2bbc38010ee8..c24f6d0e3062 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aab8df141fdc4c4c9587521a24b6865390eaeb79
+refs/heads/master: 9c7d462eda13ca211b7b4a62f191f4cfda135e2d
diff --git a/trunk/drivers/char/drm/drmP.h b/trunk/drivers/char/drm/drmP.h
index 307254da7d08..54b561e69486 100644
--- a/trunk/drivers/char/drm/drmP.h
+++ b/trunk/drivers/char/drm/drmP.h
@@ -767,6 +767,20 @@ static inline int drm_mtrr_del(int handle, unsigned long offset,
 
 #else
 #define drm_core_has_MTRR(dev) (0)
+
+#define DRM_MTRR_WC		0
+
+static inline int drm_mtrr_add(unsigned long offset, unsigned long size,
+			       unsigned int flags)
+{
+	return 0;
+}
+
+static inline int drm_mtrr_del(int handle, unsigned long offset,
+			       unsigned long size, unsigned int flags)
+{
+	return 0;
+}
 #endif
 
 /******************************************************************/