git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (10249): v4l2-common: added v4l2_i2c_tuner_addrs()
[safe/jmp/linux-2.6]
/
include
/
media
/
saa7146_vv.h
diff --git
a/include/media/saa7146_vv.h
b/include/media/saa7146_vv.h
index
cce20ed
..
c8d0b23
100644
(file)
--- a/
include/media/saa7146_vv.h
+++ b/
include/media/saa7146_vv.h
@@
-1,10
+1,10
@@
#ifndef __SAA7146_VV__
#define __SAA7146_VV__
#ifndef __SAA7146_VV__
#define __SAA7146_VV__
-#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
#include <media/saa7146.h>
#include <media/saa7146.h>
-#include <media/video
-buf
.h>
+#include <media/video
buf-dma-sg
.h>
#define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */
#define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */
#define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */
#define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */
@@
-177,9
+177,9
@@
struct saa7146_ext_vv
int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
struct saa7146_extension_ioctls *ioctls;
int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
struct saa7146_extension_ioctls *ioctls;
-
int (*ioctl)(struct saa7146_fh
*, unsigned int cmd, void *arg);
+
long (*ioctl)(struct saa7146_fh
*, unsigned int cmd, void *arg);
- struct file_operations vbi_fops;
+ struct
v4l2_
file_operations vbi_fops;
};
struct saa7146_use_ops {
};
struct saa7146_use_ops {
@@
-216,8
+216,7
@@
void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data);
extern struct saa7146_use_ops saa7146_video_uops;
int saa7146_start_preview(struct saa7146_fh *fh);
int saa7146_stop_preview(struct saa7146_fh *fh);
extern struct saa7146_use_ops saa7146_video_uops;
int saa7146_start_preview(struct saa7146_fh *fh);
int saa7146_stop_preview(struct saa7146_fh *fh);
-int saa7146_video_do_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, void *arg);
+long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);
/* from saa7146_vbi.c */
extern struct saa7146_use_ops saa7146_vbi_uops;
/* from saa7146_vbi.c */
extern struct saa7146_use_ops saa7146_vbi_uops;