diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 06:53:02 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 06:53:02 +0100 |
commit | ce6d841e9c0e177a594615dc0e69dd04972a696c (patch) | |
tree | 61c24c2dcd481502fdc0250407918469b5298a61 /include/uapi/linux/eventpoll.h | |
parent | c0cba03baa0d285b1a8f9d3481be1868df7af1ad (diff) | |
parent | 6893f5675f54d6452aded27f9a1d5e86a3bddcbe (diff) | |
download | op-kernel-dev-ce6d841e9c0e177a594615dc0e69dd04972a696c.zip op-kernel-dev-ce6d841e9c0e177a594615dc0e69dd04972a696c.tar.gz |
Merge branch 'akpm' (Fixes from Andrew)
Merge misc fixes from Andrew Morton:
"Five fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (5 patches)
h8300: add missing L1_CACHE_SHIFT
mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
fanotify: fix missing break
revert "epoll: support for disabling items, and a self-test app"
checkpatch: improve network block comment style checking
Diffstat (limited to 'include/uapi/linux/eventpoll.h')
-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 |