summaryrefslogtreecommitdiff
path: root/lib/intel_reg.h
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-08-24 14:02:02 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-08-24 23:20:22 +0200
commit6b3e6f28d2ba738fd2677b6c3e4f7ec03d9a463a (patch)
tree8afee98caa794bd2265bd8d13082b339587207d3 /lib/intel_reg.h
parent99fdba921ed88381ab721b15299e637366042465 (diff)
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>
Diffstat (limited to 'lib/intel_reg.h')
-rw-r--r--lib/intel_reg.h2
1 files changed, 1 insertions, 1 deletions
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