From 6b3e6f28d2ba738fd2677b6c3e4f7ec03d9a463a Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri, 24 Aug 2012 14:02:02 -0700
Subject: Rename NOPID to NO_PID to avoid conflict with Solaris NOPID

Solaris <sys/types.h> already has #define NOPID (pid_t)(-1)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 lib/intel_reg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/intel_reg.h')

diff --git a/lib/intel_reg.h b/lib/intel_reg.h
index ffded64e..c09343a6 100644
--- a/lib/intel_reg.h
+++ b/lib/intel_reg.h
@@ -428,7 +428,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # define I830_PRIMARY_RING_1_DONE	(1 << 1)
 # define I830_PRIMARY_RING_0_DONE	(1 << 0)
 
-#define NOPID                    0x2094
+#define NO_PID                   0x2094
 
 #define SCPD0                    0x209c	/* debug */
 #define INST_PS                  0x20c4
-- 
cgit v1.2.3