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>
This commit is contained in:
Alan Coopersmith 2012-08-24 14:02:02 -07:00 committed by Daniel Vetter
parent 99fdba921e
commit 6b3e6f28d2
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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),