Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755119AbZFTUpT (ORCPT ); Sat, 20 Jun 2009 16:45:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753516AbZFTUpI (ORCPT ); Sat, 20 Jun 2009 16:45:08 -0400 Received: from hera.kernel.org ([140.211.167.34]:50730 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752309AbZFTUpG (ORCPT ); Sat, 20 Jun 2009 16:45:06 -0400 Subject: [PATCH -tip RESEND] x86: asm/termios.h remove irrelevant comment for userspace From: Jaswinder Singh Rajput To: Ingo Molnar Cc: x86 maintainers , Sam Ravnborg , LKML , Arnd Bergmann , Christoph Hellwig In-Reply-To: <1245347157.2481.14.camel@ht.satnam> References: <1245314365.31204.7.camel@ht.satnam> <1245346986.2481.10.camel@ht.satnam> <1245347082.2481.12.camel@ht.satnam> <1245347118.2481.13.camel@ht.satnam> <1245347157.2481.14.camel@ht.satnam> Content-Type: text/plain Date: Sun, 21 Jun 2009 02:16:01 +0530 Message-Id: <1245530761.2459.3.camel@ht.satnam> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2233 Lines: 76 following comment is irrelevant at usr/include/asm/termios.h : "ioctl (fd, TIOCSERGETLSR, &result) where result may be as below" Also fixed some alignment and space issues. Signed-off-by: Jaswinder Singh Rajput --- arch/x86/include/asm/termios.h | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/x86/include/asm/termios.h b/arch/x86/include/asm/termios.h index c4ee805..ee6f0c8 100644 --- a/arch/x86/include/asm/termios.h +++ b/arch/x86/include/asm/termios.h @@ -5,20 +5,20 @@ #include struct winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; + unsigned short ws_row; + unsigned short ws_col; + unsigned short ws_xpixel; + unsigned short ws_ypixel; }; #define NCC 8 struct termio { - unsigned short c_iflag; /* input mode flags */ - unsigned short c_oflag; /* output mode flags */ - unsigned short c_cflag; /* control mode flags */ - unsigned short c_lflag; /* local mode flags */ - unsigned char c_line; /* line discipline */ - unsigned char c_cc[NCC]; /* control characters */ + unsigned short c_iflag; /* input mode flags */ + unsigned short c_oflag; /* output mode flags */ + unsigned short c_cflag; /* control mode flags */ + unsigned short c_lflag; /* local mode flags */ + unsigned char c_line; /* line discipline */ + unsigned char c_cc[NCC]; /* control characters */ }; /* modem lines */ @@ -37,10 +37,10 @@ struct termio { #define TIOCM_OUT2 0x4000 #define TIOCM_LOOP 0x8000 -/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ - #ifdef __KERNEL__ +/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ + #include /* intr=^C quit=^\ erase=del kill=^U @@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u, } #endif /* __KERNEL__ */ - #endif /* _ASM_X86_TERMIOS_H */ -- 1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/