aboutsummaryrefslogtreecommitdiff
path: root/include/linux/videodev2.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 14:54:35 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 14:54:35 -0700
commitd6f410bdbcb435c744c4f8259d6659ae2c6e447a (patch)
tree5426dd9fd8a358fe7e3517c00f83f38ba7f9dca7 /include/linux/videodev2.h
parenteaf729c8a8bfc9c7a5ff5659e3b2584bf2ef22e1 (diff)
parent1b2232ab879993fcf5b9391c3febf6ab5d78201e (diff)
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5880): wm8775/wm8739: Fix memory leak when unloading module V4L/DVB (5877): radio-gemtek-pci: remove unused structure member V4L/DVB (5871): Conexant 2388x: check for kthread_run V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next. V4L/DVB (5867): videodev2.h: add missing <sys/time.h> for userspace V4L/DVB (5866): ivtv: fix DMA timeout when capturing VBI + another stream V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134 V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers V4L/DVB (5855): ivtv: fix Kconfig typo and refer to the driver homepage. V4L/DVB (5854): ivtv: cleanup of driver messages V4L/DVB (5853): ivtv: add support to suppress high volume i2c debug messages. V4L/DVB (5852): ivtv: don't recompile needlessly V4L/DVB (5851): ivtv: fix missing I2C_ALGOBIT config option V4L/DVB (5850): ivtv: improve API command debugging V4L/DVB (5848): Av7110: fix typo
Diffstat (limited to 'include/linux/videodev2.h')
-rw-r--r--include/linux/videodev2.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index d16a2b57dc8..c66c8a3410b 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -60,6 +60,7 @@
#include <linux/compiler.h> /* need __user */
#else
#define __user
+#include <sys/time.h>
#endif
#include <linux/types.h>