diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 10:42:59 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 10:42:59 -0500 |
| commit | 57260e4088894de25bb1837d529708c3ec705a69 (patch) | |
| tree | e7072aed15b203197549099371db55c5d4bc3c0a /include/uapi/linux | |
| parent | 2d4d07b97c0b774ea9ce2a2105818208d3df7241 (diff) | |
| parent | 3d5e2abe6e265acc5e1fda810301243e9bac92b2 (diff) | |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX fixes for 3.7-rc
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: ehci: fix host power mask bit
ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/uapi/linux')
| -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 |