diff --git a/[refs] b/[refs] index 48f883a9dfc4..5b69090be890 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e619a1bf9ac878e6a984e4e279ccf712a65bc23 +refs/heads/master: a547e5e0d8b85ccc640756eb40b3dd6b33796cf8 diff --git a/trunk/drivers/staging/dgrp/dgrp_net_ops.c b/trunk/drivers/staging/dgrp/dgrp_net_ops.c index 0788357fd3ca..8185a57d31c5 100644 --- a/trunk/drivers/staging/dgrp/dgrp_net_ops.c +++ b/trunk/drivers/staging/dgrp/dgrp_net_ops.c @@ -2495,7 +2495,7 @@ static void dgrp_receive(struct nd_struct *nd) /* * Fabricate and insert a data packet header to - * preceed the remaining data when it comes in. + * preced the remaining data when it comes in. */ if (remain < plen) { @@ -2664,7 +2664,7 @@ static void dgrp_receive(struct nd_struct *nd) } /* - * Handle delayed response arrival preceeding + * Handle delayed response arrival preceding * the open response we are waiting for. */ @@ -3502,7 +3502,7 @@ void dgrp_poll_handler(unsigned long arg) /* * Decrement statistics. These are only for use with * KME, so don't worry that the operations are done - * unlocked, and so the results are occassionally wrong. + * unlocked, and so the results are occasionally wrong. */ nd->nd_read_count -= (nd->nd_read_count + diff --git a/trunk/drivers/staging/dgrp/dgrp_tty.c b/trunk/drivers/staging/dgrp/dgrp_tty.c index 0db4c0514f63..e3fa6eac53ce 100644 --- a/trunk/drivers/staging/dgrp/dgrp_tty.c +++ b/trunk/drivers/staging/dgrp/dgrp_tty.c @@ -432,7 +432,7 @@ static void drp_param(struct ch_struct *ch) /* * From the POSIX.1 spec (7.1.2.6): "If {_POSIX_VDISABLE} * is defined for the terminal device file, and the value - * of one of the changable special control characters (see + * of one of the changeable special control characters (see * 7.1.1.9) is {_POSIX_VDISABLE}, that function shall be * disabled, that is, no input data shall be recognized as * the disabled special character." @@ -2699,7 +2699,7 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd, - looking at the tty_ioctl code, these command all call our tty_set_termios at the driver's end, when a TCSETA* is sent, it is expecting the tty to have a termio structure, - NOT a termios stucture. These two structures differ in size + NOT a termios structure. These two structures differ in size and the tty_ioctl code does a conversion before processing them both. - we should treat the TCSETAW TCSETAF ioctls the same, and let the tty_ioctl code do the conversion stuff. @@ -2996,7 +2996,7 @@ static void dgrp_tty_start(struct tty_struct *tty) } /* - * Stop the reciever + * Stop the receiver */ static void dgrp_tty_input_stop(struct tty_struct *tty) {