From 04dd08b45be863f016df648a149ade1411608d00 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 10 May 2007 22:22:40 -0700 Subject: Consolidate asm/poll.h These files are almost all the same. This patch could be made even simpler if we don't mind POLLREMOVE turning up in a few architectures that didn't have it previously (which should be OK as POLLREMOVE is not used anywhere in the current tree). Signed-off-by: Stephen Rothwell Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-sh64/poll.h | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'include/asm-sh64') diff --git a/include/asm-sh64/poll.h b/include/asm-sh64/poll.h index 3a6cbad08d28..ca2950267c53 100644 --- a/include/asm-sh64/poll.h +++ b/include/asm-sh64/poll.h @@ -1,37 +1,8 @@ #ifndef __ASM_SH64_POLL_H #define __ASM_SH64_POLL_H -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * include/asm-sh64/poll.h - * - * Copyright (C) 2000, 2001 Paolo Alberelli - * - */ +#include -/* These are specified by iBCS2 */ -#define POLLIN 0x0001 -#define POLLPRI 0x0002 -#define POLLOUT 0x0004 -#define POLLERR 0x0008 -#define POLLHUP 0x0010 -#define POLLNVAL 0x0020 - -/* The rest seem to be more-or-less nonstandard. Check them! */ -#define POLLRDNORM 0x0040 -#define POLLRDBAND 0x0080 -#define POLLWRNORM 0x0100 -#define POLLWRBAND 0x0200 -#define POLLMSG 0x0400 -#define POLLRDHUP 0x2000 - -struct pollfd { - int fd; - short events; - short revents; -}; +#undef POLLREMOVE #endif /* __ASM_SH64_POLL_H */ -- cgit v1.2.3-59-g8ed1b