From aafc852f1726a98781dc2695dfb151aecff63b9b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 17 Jun 2010 13:16:08 -0700 Subject: [PATCH] --- yaml --- r: 207882 b: refs/heads/master c: a3c8ed693da9782f924223f65da9261da796e49b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/alpha/include/asm/ioctls.h | 2 -- trunk/arch/avr32/include/asm/ioctls.h | 2 -- trunk/arch/cris/include/asm/ioctls.h | 2 -- trunk/arch/ia64/include/asm/ioctls.h | 2 -- trunk/arch/m32r/include/asm/ioctls.h | 2 -- trunk/arch/mips/include/asm/ioctls.h | 2 -- trunk/arch/mn10300/include/asm/ioctls.h | 2 -- trunk/arch/parisc/include/asm/ioctls.h | 2 -- 9 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index a3b58a003ddb..30085a617537 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39e5322c074f895b5b5c657a312c56b6c6154a38 +refs/heads/master: a3c8ed693da9782f924223f65da9261da796e49b diff --git a/trunk/arch/alpha/include/asm/ioctls.h b/trunk/arch/alpha/include/asm/ioctls.h index 67bb9f6fdbe4..c7b0cc61ce5b 100644 --- a/trunk/arch/alpha/include/asm/ioctls.h +++ b/trunk/arch/alpha/include/asm/ioctls.h @@ -106,7 +106,5 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ #endif /* _ASM_ALPHA_IOCTLS_H */ diff --git a/trunk/arch/avr32/include/asm/ioctls.h b/trunk/arch/avr32/include/asm/ioctls.h index e6ac0b661076..143dafb3997e 100644 --- a/trunk/arch/avr32/include/asm/ioctls.h +++ b/trunk/arch/avr32/include/asm/ioctls.h @@ -72,8 +72,6 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ #define FIOQSIZE 0x5460 /* Used for packet mode */ diff --git a/trunk/arch/cris/include/asm/ioctls.h b/trunk/arch/cris/include/asm/ioctls.h index 076c07824eb6..bb49142dc6ab 100644 --- a/trunk/arch/cris/include/asm/ioctls.h +++ b/trunk/arch/cris/include/asm/ioctls.h @@ -70,8 +70,6 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ #define FIOQSIZE 0x5460 #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ diff --git a/trunk/arch/ia64/include/asm/ioctls.h b/trunk/arch/ia64/include/asm/ioctls.h index f41b636a0bf6..f0ee86c0b5f7 100644 --- a/trunk/arch/ia64/include/asm/ioctls.h +++ b/trunk/arch/ia64/include/asm/ioctls.h @@ -75,8 +75,6 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ #define FIOQSIZE 0x5460 /* Used for packet mode */ diff --git a/trunk/arch/m32r/include/asm/ioctls.h b/trunk/arch/m32r/include/asm/ioctls.h index b9f54bb5d7cf..f4c13a52fe48 100644 --- a/trunk/arch/m32r/include/asm/ioctls.h +++ b/trunk/arch/m32r/include/asm/ioctls.h @@ -69,8 +69,6 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ #define FIOQSIZE 0x5460 /* Used for packet mode */ diff --git a/trunk/arch/mips/include/asm/ioctls.h b/trunk/arch/mips/include/asm/ioctls.h index 3f04a995ec54..2fb9e1693bf7 100644 --- a/trunk/arch/mips/include/asm/ioctls.h +++ b/trunk/arch/mips/include/asm/ioctls.h @@ -103,7 +103,5 @@ #define TIOCSERSETMULTI 0x5490 /* Set multiport config */ #define TIOCMIWAIT 0x5491 /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x5492 /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x5493 /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x5494 /* Set Hayes ESP configuration */ #endif /* __ASM_IOCTLS_H */ diff --git a/trunk/arch/mn10300/include/asm/ioctls.h b/trunk/arch/mn10300/include/asm/ioctls.h index dcbfb452974f..638219a99b1e 100644 --- a/trunk/arch/mn10300/include/asm/ioctls.h +++ b/trunk/arch/mn10300/include/asm/ioctls.h @@ -70,8 +70,6 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ #define FIOQSIZE 0x5460 /* Used for packet mode */ diff --git a/trunk/arch/parisc/include/asm/ioctls.h b/trunk/arch/parisc/include/asm/ioctls.h index 6747fad07a3e..6cc497e52532 100644 --- a/trunk/arch/parisc/include/asm/ioctls.h +++ b/trunk/arch/parisc/include/asm/ioctls.h @@ -68,8 +68,6 @@ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ #define FIOQSIZE 0x5460 /* Get exact space used by quota */ #define TIOCSTART 0x5461