From 944fb82ac112006b323391400d7db3108caa7bcd Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 14 Oct 2003 01:18:51 -0700 Subject: [PATCH] [PATCH] USB: Conflicting definitions in keyspan driver There's a small issue with drivers/usb/serial/keyspan_usa90msg.h The definition for MSR_RI conflicts with some PowerPC CPU definition (MSR is the Machine State Register on PPC and processor.h defines MSR_RI globally). This definition doesn't seem to be used in any .c in drivers/usr/serial though, so I beleive it could be easily renamed to something a bit less prone to conflict ;) Changing the PPC definition would be a lot nastier. --- drivers/usb/serial/keyspan_usa90msg.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/serial/keyspan_usa90msg.h b/drivers/usb/serial/keyspan_usa90msg.h index 5af43d42c33af..dd935b62c1a82 100644 --- a/drivers/usb/serial/keyspan_usa90msg.h +++ b/drivers/usb/serial/keyspan_usa90msg.h @@ -182,14 +182,14 @@ struct keyspan_usa90_portStatusMessage // MSR bits -#define MSR_dCTS 0x01 // CTS has changed since last report -#define MSR_dDSR 0x02 -#define MSR_dRI 0x04 -#define MSR_dDCD 0x08 - -#define MSR_CTS 0x10 // current state of CTS -#define MSR_DSR 0x20 -#define MSR_RI 0x40 +#define USA_MSR_dCTS 0x01 // CTS has changed since last report +#define USA_MSR_dDSR 0x02 +#define USA_MSR_dRI 0x04 +#define USA_MSR_dDCD 0x08 + +#define USA_MSR_CTS 0x10 // current state of CTS +#define USA_MSR_DSR 0x20 +#define USA_USA_MSR_RI 0x40 #define MSR_DCD 0x80 // ie: the maximum length of an endpoint buffer -- 2.53.0