diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 07:41:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 07:41:27 +0200 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /drivers/media/pci/ivtv/ivtv-controls.h | |
| parent | tty: serial: sccnxp: Fix bug with unterminated platform_id list (diff) | |
| parent | Linux 3.7-rc1 (diff) | |
| download | linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.tar.xz linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.zip | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-controls.h')
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-controls.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-controls.h b/drivers/media/pci/ivtv/ivtv-controls.h new file mode 100644 index 000000000000..3999e6358312 --- /dev/null +++ b/drivers/media/pci/ivtv/ivtv-controls.h @@ -0,0 +1,28 @@ +/* + ioctl control functions + Copyright (C) 2003-2004 Kevin Thayer <nufan_wfk at yahoo.com> + Copyright (C) 2005-2007 Hans Verkuil <hverkuil@xs4all.nl> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef IVTV_CONTROLS_H +#define IVTV_CONTROLS_H + +extern struct cx2341x_handler_ops ivtv_cxhdl_ops; +extern const struct v4l2_ctrl_ops ivtv_hdl_out_ops; +int ivtv_g_pts_frame(struct ivtv *itv, s64 *pts, s64 *frame); + +#endif |