The patch titled
char: remove unneded termbits redefinitions
has been removed from the -mm tree. Its filename is
char-remove-unneded-termbits-redefinitions.patch
This patch was dropped because it had testing failures
------------------------------------------------------
Subject: char: remove unneded termbits redefinitions
From: Jiri Slaby <jirislaby@xxxxxxxxx>
No need to redefine termbits in char tree.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/ip2/ip2ioctl.h | 35 ----------------------------------
drivers/char/ip2/ip2main.c | 1
drivers/char/mxser.c | 7 ------
3 files changed, 43 deletions(-)
diff -puN drivers/char/ip2/ip2ioctl.h~char-remove-unneded-termbits-redefinitions /dev/null
--- 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 -puN drivers/char/ip2/ip2main.c~char-remove-unneded-termbits-redefinitions drivers/char/ip2/ip2main.c
--- a/drivers/char/ip2/ip2main.c~char-remove-unneded-termbits-redefinitions
+++ a/drivers/char/ip2/ip2main.c
@@ -123,7 +123,6 @@
#include "ip2types.h"
#include "ip2trace.h"
-#include "ip2ioctl.h"
#include "ip2.h"
#include "i2ellis.h"
#include "i2lib.h"
diff -puN drivers/char/mxser.c~char-remove-unneded-termbits-redefinitions drivers/char/mxser.c
--- a/drivers/char/mxser.c~char-remove-unneded-termbits-redefinitions
+++ a/drivers/char/mxser.c
@@ -1496,10 +1496,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;
@@ -2550,9 +2546,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);
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
char-remove-unneded-termbits-redefinitions.patch
pci-mxser-pci-refcounts.patch
mxser-make-an-experimental-clone.patch
char-mxser_new-correct-include-file.patch
char-mxser_new-upgrade-to-191.patch
char-mxser_new-rework-to-allow-dynamic-structs.patch
char-mxser_new-use-__devinit-macros.patch
char-mxser_new-pci_request_region-for-pci-regions.patch
char-mxser_new-check-request_region-retvals.patch
char-mxser_new-kill-unneeded-memsets.patch
char-mxser_new-revert-spin_lock-changes.patch
char-mxser_new-remove-request-for-testers-line.patch
char-mxser_new-debug-printk-dependent-on-debug.patch
char-mxser_new-alter-license-terms.patch
char-mxser_new-code-upside-down.patch
char-mxser_new-cmspar-is-defined.patch
char-remove-unneded-termbits-redefinitions-mxser_new.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
