From 2c4093d9eaabae30df1d968fe907ca52551cace0 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 16 Nov 2011 22:39:32 +0000
Subject: [PATCH] --- yaml --- r: 282454 b: refs/heads/master c:
 04bd564fdb3cbea09d14a271b4f2d616cc8eac90 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/gma500/psb_drm.h | 3 ---
 trunk/drivers/gpu/drm/gma500/psb_drv.h | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f9ad72d82072..562d12a990ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 770179d5e35c191e2c760d37abd5572ccdf6a002
+refs/heads/master: 04bd564fdb3cbea09d14a271b4f2d616cc8eac90
diff --git a/trunk/drivers/gpu/drm/gma500/psb_drm.h b/trunk/drivers/gpu/drm/gma500/psb_drm.h
index 6ded3439614d..113686785717 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_drm.h
+++ b/trunk/drivers/gpu/drm/gma500/psb_drm.h
@@ -22,9 +22,6 @@
 #ifndef _PSB_DRM_H_
 #define _PSB_DRM_H_
 
-#define PSB_NUM_PIPE 3
-
-
 /*
  *	Manage the LUT for an output
  */
diff --git a/trunk/drivers/gpu/drm/gma500/psb_drv.h b/trunk/drivers/gpu/drm/gma500/psb_drv.h
index 956774888cc3..ffb05f2c79e1 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_drv.h
+++ b/trunk/drivers/gpu/drm/gma500/psb_drv.h
@@ -258,6 +258,8 @@ struct psb_intel_opregion {
 
 struct psb_ops;
 
+#define PSB_NUM_PIPE		3
+
 struct drm_psb_private {
 	struct drm_device *dev;
 	const struct psb_ops *ops;