aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/saa7146.h4
-rw-r--r--include/media/saa7146_vv.h10
2 files changed, 7 insertions, 7 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index 2a897c3a6a9a..101f56c8a641 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -112,7 +112,7 @@ struct saa7146_dev
112 112
113 /* different device locks */ 113 /* different device locks */
114 spinlock_t slock; 114 spinlock_t slock;
115 struct semaphore lock; 115 struct semaphore lock;
116 116
117 unsigned char __iomem *mem; /* pointer to mapped IO memory */ 117 unsigned char __iomem *mem; /* pointer to mapped IO memory */
118 int revision; /* chip revision; needed for bug-workarounds*/ 118 int revision; /* chip revision; needed for bug-workarounds*/
@@ -133,7 +133,7 @@ struct saa7146_dev
133 void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); 133 void (*vv_callback)(struct saa7146_dev *dev, unsigned long status);
134 134
135 /* i2c-stuff */ 135 /* i2c-stuff */
136 struct semaphore i2c_lock; 136 struct semaphore i2c_lock;
137 u32 i2c_bitrate; 137 u32 i2c_bitrate;
138 struct saa7146_dma d_i2c; /* pointer to i2c memory */ 138 struct saa7146_dma d_i2c; /* pointer to i2c memory */
139 wait_queue_head_t i2c_wq; 139 wait_queue_head_t i2c_wq;
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 64691753721e..16af9299315f 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -113,7 +113,7 @@ struct saa7146_vv
113 /* vbi capture */ 113 /* vbi capture */
114 struct saa7146_dmaqueue vbi_q; 114 struct saa7146_dmaqueue vbi_q;
115 /* vbi workaround interrupt queue */ 115 /* vbi workaround interrupt queue */
116 wait_queue_head_t vbi_wq; 116 wait_queue_head_t vbi_wq;
117 int vbi_fieldcount; 117 int vbi_fieldcount;
118 struct saa7146_fh *vbi_streaming; 118 struct saa7146_fh *vbi_streaming;
119 119
@@ -181,10 +181,10 @@ struct saa7146_ext_vv
181}; 181};
182 182
183struct saa7146_use_ops { 183struct saa7146_use_ops {
184 void (*init)(struct saa7146_dev *, struct saa7146_vv *); 184 void (*init)(struct saa7146_dev *, struct saa7146_vv *);
185 int(*open)(struct saa7146_dev *, struct file *); 185 int(*open)(struct saa7146_dev *, struct file *);
186 void (*release)(struct saa7146_dev *, struct file *); 186 void (*release)(struct saa7146_dev *, struct file *);
187 void (*irq_done)(struct saa7146_dev *, unsigned long status); 187 void (*irq_done)(struct saa7146_dev *, unsigned long status);
188 ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); 188 ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
189}; 189};
190 190