diff options
| author | Jeff Dike <jdike@addtoit.com> | 2010-06-17 21:15:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 22:47:39 +0200 |
| commit | 39e5322c074f895b5b5c657a312c56b6c6154a38 (patch) | |
| tree | ca4ed9e999559f3ac96007a23d7c95228160df37 /include/asm-generic | |
| parent | serial: fix wakup races in the mrst_max3110 driver (diff) | |
| download | linux-39e5322c074f895b5b5c657a312c56b6c6154a38.tar.xz linux-39e5322c074f895b5b5c657a312c56b6c6154a38.zip | |
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>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/ioctls.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-generic/ioctls.h b/include/asm-generic/ioctls.h index a799e20a769e..1375fa1a7a4d 100644 --- 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 |