diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 03:28:43 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 03:28:43 (GMT) |
| commit | 2bf81c8af92dd53890557c5d87875842d573a3e9 (patch) | |
| tree | 83e7e3539599b091ac69557658c06c0a39cfa60e /include/uapi | |
| parent | 9526d9bc23f362035cfabf044aa90f4ed1787955 (diff) | |
| parent | 5f6c4ab6ee781c9aace7c8548ad9bd87f5678df7 (diff) | |
| download | linux-fsl-qoriq-2bf81c8af92dd53890557c5d87875842d573a3e9.tar.xz | |
Merge branch 'arch-microblaze' into no-rebases
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/eventpoll.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h index 8c99ce7..2c267bc 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -25,7 +25,6 @@ #define EPOLL_CTL_ADD 1 #define EPOLL_CTL_DEL 2 #define EPOLL_CTL_MOD 3 -#define EPOLL_CTL_DISABLE 4 /* * Request the handling of system wakeup events so as to prevent system suspends |