diff options
| author |   Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:23:58 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:23:58 -0500 |
| commit | 2871f352c600d36b1b8ba57c79029cf8aa512948 (patch) | |
| tree | 64e6da828a9e1a0c9dc4fbe45a1172e689a22deb /include/linux/timerfd.h | |
| parent | [media] cx23885: fix UNSET/TUNER_ABSENT confusion (diff) | |
| parent | Linux 3.17-rc1 (diff) | |
Merge tag 'v3.17-rc1' into patchwork
Linux 3.17-rc1
Diffstat (limited to 'include/linux/timerfd.h')
| -rw-r--r-- | include/linux/timerfd.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/timerfd.h b/include/linux/timerfd.h index d3b57fa12225..bd36ce431e32 100644 --- a/include/linux/timerfd.h +++ b/include/linux/timerfd.h @@ -11,6 +11,9 @@ /* For O_CLOEXEC and O_NONBLOCK */ #include <linux/fcntl.h> +/* For _IO helpers */ +#include <linux/ioctl.h> + /* * CAREFUL: Check include/asm-generic/fcntl.h when defining * new flags, since they might collide with O_* ones. We want @@ -29,4 +32,6 @@ /* Flags for timerfd_settime. */ #define TFD_SETTIME_FLAGS (TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET) +#define TFD_IOC_SET_TICKS _IOW('T', 0, u64) + #endif /* _LINUX_TIMERFD_H */ |