Messages in this thread | | | Date | Wed, 4 Jan 2012 14:24:31 -0800 | From | Greg KH <> | Subject | Re: [PATCH] serial/documentation: fix name of DCD cpp symbol |
| |
On Wed, Jan 04, 2012 at 03:13:29PM -0800, Randy Dunlap wrote: > On 12/02/2011 03:42 PM, Alan Cox wrote: > > On Fri, 2 Dec 2011 21:20:11 +0100 > > Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > > >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > >> --- > >> Documentation/serial/driver | 2 +- > >> 1 files changed, 1 insertions(+), 1 deletions(-) > >> > >> diff --git a/Documentation/serial/driver b/Documentation/serial/driver > >> index 77ba0af..0a25a91 100644 > >> --- a/Documentation/serial/driver > >> +++ b/Documentation/serial/driver > >> @@ -101,7 +101,7 @@ hardware. > >> Returns the current state of modem control inputs. The state > >> of the outputs should not be returned, since the core keeps > >> track of their state. The state information should include: > >> - - TIOCM_DCD state of DCD signal > >> + - TIOCM_CAR state of DCD signal > >> - TIOCM_CTS state of CTS signal > >> - TIOCM_DSR state of DSR signal > >> - TIOCM_RI state of RI signal > > > > Acked-by: Alan Cox <alan@linux.intel.com> > > > > but please fix the Subject line to be less confusing - it sounds like > > it changes the define not the docs... > > > (sorry for the delayed reply) > > I thought that DCD meant Data Carrier Detect. Is that old? Has it changed > to just Carrier? > > Greg, do you want to merge this?
Sure, I can, care to bounce me the original?
greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |