From 6c29e48e5af68de9b5aab5b8c8f17c8b63791591 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Thu, 17 Jun 2010 15:15:16 -0400 Subject: [PATCH] --- yaml --- r: 207881 b: refs/heads/master c: 39e5322c074f895b5b5c657a312c56b6c6154a38 h: refs/heads/master i: 207879: a39bdb236edfdec694f8229d511eee400994bafd v: v3 --- [refs] | 2 +- trunk/include/asm-generic/ioctls.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1154e7b114a8..a3b58a003ddb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6e679b474c096f1125087e789e7af8886de39d3 +refs/heads/master: 39e5322c074f895b5b5c657a312c56b6c6154a38 diff --git a/trunk/include/asm-generic/ioctls.h b/trunk/include/asm-generic/ioctls.h index a799e20a769e..1375fa1a7a4d 100644 --- a/trunk/include/asm-generic/ioctls.h +++ b/trunk/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