From 6b3e6f28d2ba738fd2677b6c3e4f7ec03d9a463a Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 24 Aug 2012 14:02:02 -0700 Subject: Rename NOPID to NO_PID to avoid conflict with Solaris NOPID Solaris already has #define NOPID (pid_t)(-1) Signed-off-by: Alan Coopersmith Signed-off-by: Daniel Vetter --- lib/intel_reg.h | 2 +- tools/intel_reg_dumper.c | 2 +- 2 files changed, 2 insertions(+), 2 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 diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c index a994f008..65050339 100644 --- a/tools/intel_reg_dumper.c +++ b/tools/intel_reg_dumper.c @@ -1897,7 +1897,7 @@ static struct reg_debug i945gm_mi_regs[] = { DEFINEREG(IPEIR), DEFINEREG(IPEHR), DEFINEREG(INST_DONE), - DEFINEREG(NOPID), + DEFINEREG(NO_PID), DEFINEREG(HWSTAM), DEFINEREG(SCPD0), DEFINEREG(IER), -- cgit v1.2.3