diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-08-24 14:02:02 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-24 23:20:22 +0200 |
| commit | 6b3e6f28d2ba738fd2677b6c3e4f7ec03d9a463a (patch) | |
| tree | 8afee98caa794bd2265bd8d13082b339587207d3 | |
| parent | 99fdba921ed88381ab721b15299e637366042465 (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>
| -rw-r--r-- | lib/intel_reg.h | 2 | ||||
| -rw-r--r-- | 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 ffded64e2..c09343a6f 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 a994f008e..65050339d 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), |