Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 39e5322c074f895b5b5c657a312c56b6c6154a38

Authored by Jeff Dike
Committed by Greg Kroah-Hartman
1 parent d6e679b474
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

tty: Remove Hayes ESP ioctls 

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>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

include/asm-generic/ioctls.h
Diff comments   View file @ 39e5322
... ... @@ -87,12 +87,10 @@
87 87 #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
88 88  
89 89 /*
90   - * some architectures define FIOQSIZE as 0x545E, which is used for
91   - * TIOCGHAYESESP on others
  90 + * Some arches already define FIOQSIZE due to a historical
  91 + * conflict with a Hayes modem-specific ioctl value.
92 92 */
93 93 #ifndef FIOQSIZE
94   -# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
95   -# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
96 94 # define FIOQSIZE 0x5460
97 95 #endif
98 96