On Wed, 2006-10-04 at 18:49 +0200, Jiri Slaby wrote: > Char, remove unneded termbits redefinitions > > No need to redefine termbits in char tree. > > Signed-off-by: Jiri Slaby <[email protected]> Acked-by: Michael H. Warfield <[email protected]> > --- > commit b886c49c87ee91a038b917f6933183db8ae58125 > tree 222a9b1893f7d8f52ec3326bbc634296d1ab5603 > parent 6545715838791f2e9f1501b5b48fae69f2d82d35 > author Jiri Slaby <[email protected]> Wed, 04 Oct 2006 18:41:15 +0200 > committer Jiri Slaby <[email protected]> Wed, 04 Oct 2006 18:41:15 +0200 > > drivers/char/ip2/ip2ioctl.h | 35 ----------------------------------- > drivers/char/ip2/ip2main.c | 1 - > drivers/char/mxser.c | 7 ------- > drivers/char/mxser_new.c | 3 --- > 4 files changed, 0 insertions(+), 46 deletions(-) > > diff --git a/drivers/char/ip2/ip2ioctl.h b/drivers/char/ip2/ip2ioctl.h > deleted file mode 100644 > index aa0a9da..0000000 > --- a/drivers/char/ip2/ip2ioctl.h > +++ /dev/null > @@ -1,35 +0,0 @@ > -/******************************************************************************* > -* > -* (c) 1998 by Computone Corporation > -* > -******************************************************************************** > -* > -* > -* PACKAGE: Linux tty Device Driver for IntelliPort II family of multiport > -* serial I/O controllers. > -* > -* DESCRIPTION: Driver constants for configuration and tuning > -* > -* NOTES: > -* > -*******************************************************************************/ > - > -#ifndef IP2IOCTL_H > -#define IP2IOCTL_H > - > -//************* > -//* Constants * > -//************* > - > -// High baud rates (if not defined elsewhere. > -#ifndef B153600 > -# define B153600 0010005 > -#endif > -#ifndef B307200 > -# define B307200 0010006 > -#endif > -#ifndef B921600 > -# define B921600 0010007 > -#endif > - > -#endif > diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c > index 62ef511..30e839c 100644 > --- a/drivers/char/ip2/ip2main.c > +++ b/drivers/char/ip2/ip2main.c > @@ -123,7 +123,6 @@ #include <asm/uaccess.h> > > #include "ip2types.h" > #include "ip2trace.h" > -#include "ip2ioctl.h" > #include "ip2.h" > #include "i2ellis.h" > #include "i2lib.h" > diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c > index 04bdcb6..af05faa 100644 > --- a/drivers/char/mxser.c > +++ b/drivers/char/mxser.c > @@ -1500,10 +1500,6 @@ static int mxser_ioctl(struct tty_struct > return 0; > } > > -#ifndef CMSPAR > -#define CMSPAR 010000000000 > -#endif > - > static int mxser_ioctl_special(unsigned int cmd, void __user *argp) > { > int i, result, status; > @@ -2554,9 +2550,6 @@ static int mxser_change_speed(struct mxs > if (!(info->base)) > return ret; > > -#ifndef B921600 > -#define B921600 (B460800 +1) > -#endif > if (mxser_set_baud_method[info->port] == 0) { > baud = tty_get_baud_rate(info->tty); > mxser_set_baud(info, baud); > diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c > index cb9c865..a555dda 100644 > --- a/drivers/char/mxser_new.c > +++ b/drivers/char/mxser_new.c > @@ -592,9 +592,6 @@ static int mxser_change_speed(struct mxs > if (!(info->ioaddr)) > return ret; > > -#ifndef B921600 > -#define B921600 (B460800 +1) > -#endif > if (mxser_set_baud_method[info->tty->index] == 0) { > baud = tty_get_baud_rate(info->tty); > mxser_set_baud(info, baud); -- Michael H. Warfield (AI4NB) | (770) 985-6132 | [email protected] /\/\|=mhw=|\/\/ | (678) 463-0932 | http://www.wittsend.com/mhw/ NIC whois: MHW9 | An optimist believes we live in the best of all PGP Key: 0xDF1DD471 | possible worlds. A pessimist is sure of it!
Attachment:
signature.asc
Description: This is a digitally signed message part
- Prev by Date: Re: wpa supplicant/ipw3945, ESSID last char missing
- Next by Date: [PATCH] ALSA: fix kernel panic in initialization of mpu401 driver
- Previous by thread: Funky "Blue screen" issue while rebooting from X with 2.6.18-git21
- Next by thread: Re: [PATCH] Char: remove unneded termbits redefinitions
- Index(es):