diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 03:00:25 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 03:00:25 -0500 |
| commit | 3f6f1cd6ffb473f426858692e8e1cb82aea137eb (patch) | |
| tree | d3f3f931d3ed57041dc0feafb8fdbf9843fcb5fc /include/uapi/linux/eventpoll.h | |
| parent | 1443f8a0b95c07cee9df4420a30eea24123af3f3 (diff) | |
| parent | b57870e28d27561ea5bad538c22b7d10f531b35c (diff) | |
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
ARM: mmp: select pinctrl driver
+ Linux 3.7-rc6
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 8c99ce7202c5..2c267bcbb85c 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #define EPOLL_CTL_ADD 1 | 25 | #define EPOLL_CTL_ADD 1 |
| 26 | #define EPOLL_CTL_DEL 2 | 26 | #define EPOLL_CTL_DEL 2 |
| 27 | #define EPOLL_CTL_MOD 3 | 27 | #define EPOLL_CTL_MOD 3 |
| 28 | #define EPOLL_CTL_DISABLE 4 | ||
| 29 | 28 | ||
| 30 | /* | 29 | /* |
| 31 | * Request the handling of system wakeup events so as to prevent system suspends | 30 | * Request the handling of system wakeup events so as to prevent system suspends |