diff options
| author | Dmitry Torokhov <[email protected]> | 2012-03-19 17:02:01 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2012-03-19 17:02:01 -0700 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /include/asm-generic/poll.h | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/asm-generic/poll.h')
| -rw-r--r-- | include/asm-generic/poll.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/poll.h b/include/asm-generic/poll.h index 44bce836d350..9ce7f44aebd2 100644 --- a/include/asm-generic/poll.h +++ b/include/asm-generic/poll.h @@ -28,6 +28,8 @@ #define POLLRDHUP 0x2000 #endif +#define POLLFREE 0x4000 /* currently only for epoll */ + struct pollfd { int fd; short events; |