public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: <gregkh@suse.de>
To: jdike@addtoit.com, alan@linux.intel.com, gregkh@suse.de,
	greg@kroah.com, jdike@linux.intel.com,
	linux-kernel@vger.kernel.org
Subject: patch tty-remove-hayes-esp-ioctls.patch added to gregkh-2.6 tree
Date: Thu, 17 Jun 2010 13:18:53 -0700	[thread overview]
Message-ID: <1276805933630@site> (raw)
In-Reply-To: <20100617191516.GA15963@c-98-229-117-200.hsd1.ma.comcast.net>


This is a note to let you know that I've just added the patch titled

    Subject: tty: Remove Hayes ESP ioctls

to my gregkh-2.6 tree.  Its filename is

    tty-remove-hayes-esp-ioctls.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From jdike@addtoit.com  Thu Jun 17 13:03:30 2010
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 17 Jun 2010 15:15:16 -0400
Subject: tty: Remove Hayes ESP ioctls
To: Greg KH <greg@kroah.com>
Cc: Alan Cox <alan@linux.intel.com>, LKML <linux-kernel@vger.kernel.org>
Message-ID: <20100617191516.GA15963@c-98-229-117-200.hsd1.ma.comcast.net>
Content-Disposition: inline

Remove Hayes ESP ioctls

The Hayes ESP driver has been removed from the tree:
commit f53a2ade0bb9f2a81f473e6469155172a96b7c38
("tty: esp: remove broken driver")
so its ioctls aren't needed any more.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 include/asm-generic/ioctls.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- a/include/asm-generic/ioctls.h
+++ b/include/asm-generic/ioctls.h
@@ -87,12 +87,10 @@
 #define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */
 
 /*
- * some architectures define FIOQSIZE as 0x545E, which is used for
- * TIOCGHAYESESP on others
+ * Some arches already define FIOQSIZE due to a historical
+ * conflict with a Hayes modem-specific ioctl value.
  */
 #ifndef FIOQSIZE
-# define TIOCGHAYESESP	0x545E  /* Get Hayes ESP configuration */
-# define TIOCSHAYESESP	0x545F  /* Set Hayes ESP configuration */
 # define FIOQSIZE	0x5460
 #endif
 


      parent reply	other threads:[~2010-06-17 20:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-17 16:00 [PATCH] Remove Hayes ESP ioctls Jeff Dike
2010-06-17 17:28 ` Greg KH
2010-06-17 19:15   ` Jeff Dike
2010-06-17 19:44     ` Arnd Bergmann
2010-06-17 20:03       ` Greg KH
2010-06-17 20:09     ` Greg KH
2010-06-17 20:14       ` Greg KH
2010-06-17 20:41         ` Arnd Bergmann
2010-06-17 21:29           ` Jeff Dike
2010-06-17 22:03             ` Greg KH
2010-06-17 23:18               ` Jeff Dike
2010-06-17 20:18     ` gregkh [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1276805933630@site \
    --to=gregkh@suse.de \
    --cc=alan@linux.intel.com \
    --cc=greg@kroah.com \
    --cc=jdike@addtoit.com \
    --cc=jdike@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox