Commit 944fb82a authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Greg Kroah-Hartman

[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.
parent 5c549937
...@@ -182,14 +182,14 @@ struct keyspan_usa90_portStatusMessage ...@@ -182,14 +182,14 @@ struct keyspan_usa90_portStatusMessage
// MSR bits // MSR bits
#define MSR_dCTS 0x01 // CTS has changed since last report #define USA_MSR_dCTS 0x01 // CTS has changed since last report
#define MSR_dDSR 0x02 #define USA_MSR_dDSR 0x02
#define MSR_dRI 0x04 #define USA_MSR_dRI 0x04
#define MSR_dDCD 0x08 #define USA_MSR_dDCD 0x08
#define MSR_CTS 0x10 // current state of CTS #define USA_MSR_CTS 0x10 // current state of CTS
#define MSR_DSR 0x20 #define USA_MSR_DSR 0x20
#define MSR_RI 0x40 #define USA_USA_MSR_RI 0x40
#define MSR_DCD 0x80 #define MSR_DCD 0x80
// ie: the maximum length of an endpoint buffer // ie: the maximum length of an endpoint buffer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment