From: gregkh on

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(a)addtoit.com Thu Jun 17 13:03:30 2010
From: Jeff Dike <jdike(a)addtoit.com>
Date: Thu, 17 Jun 2010 15:15:16 -0400
Subject: tty: Remove Hayes ESP ioctls
To: Greg KH <greg(a)kroah.com>
Cc: Alan Cox <alan(a)linux.intel.com>, LKML <linux-kernel(a)vger.kernel.org>
Message-ID: <20100617191516.GA15963(a)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(a)linux.intel.com>
Acked-by: Alan Cox <alan(a)linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/