From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933301Ab0HJWMf (ORCPT ); Tue, 10 Aug 2010 18:12:35 -0400 Received: from kroah.org ([198.145.64.141]:44800 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933293Ab0HJV7m (ORCPT ); Tue, 10 Aug 2010 17:59:42 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Jeff Dike , Jeff Dike , Greg Kroah-Hartman Subject: [PATCH 09/68] tty: Remove Hayes ESP ioctls Date: Tue, 10 Aug 2010 14:58:31 -0700 Message-Id: <1281477570-18944-9-git-send-email-gregkh@suse.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <20100810214425.GB17385@kroah.com> References: <20100810214425.GB17385@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeff Dike 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 Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- 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 a799e20..1375fa1 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 -- 1.7.2