aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/audiochip.h14
-rw-r--r--include/media/tuner.h8
-rw-r--r--include/media/video-buf.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index dd1e484e86d3..b7d4b0930408 100644
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -10,13 +10,13 @@ enum audiochip {
10 /* Provided by video chip */ 10 /* Provided by video chip */
11 AUDIO_CHIP_INTERNAL, 11 AUDIO_CHIP_INTERNAL,
12 /* Provided by tvaudio.c */ 12 /* Provided by tvaudio.c */
13 AUDIO_CHIP_TDA8425, 13 AUDIO_CHIP_TDA8425,
14 AUDIO_CHIP_TEA6300, 14 AUDIO_CHIP_TEA6300,
15 AUDIO_CHIP_TEA6420, 15 AUDIO_CHIP_TEA6420,
16 AUDIO_CHIP_TDA9840, 16 AUDIO_CHIP_TDA9840,
17 AUDIO_CHIP_TDA985X, 17 AUDIO_CHIP_TDA985X,
18 AUDIO_CHIP_TDA9874, 18 AUDIO_CHIP_TDA9874,
19 AUDIO_CHIP_PIC16C54, 19 AUDIO_CHIP_PIC16C54,
20 /* Provided by msp3400.c */ 20 /* Provided by msp3400.c */
21 AUDIO_CHIP_MSP34XX 21 AUDIO_CHIP_MSP34XX
22}; 22};
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 81025323267f..94a9511479a1 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -215,14 +215,14 @@ extern int tea5767_autodetection(struct i2c_client *c);
215 215
216#define tuner_warn(fmt, arg...) do {\ 216#define tuner_warn(fmt, arg...) do {\
217 printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \ 217 printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \
218 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) 218 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
219#define tuner_info(fmt, arg...) do {\ 219#define tuner_info(fmt, arg...) do {\
220 printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \ 220 printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \
221 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) 221 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
222#define tuner_dbg(fmt, arg...) do {\ 222#define tuner_dbg(fmt, arg...) do {\
223 if (tuner_debug) \ 223 if (tuner_debug) \
224 printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \ 224 printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \
225 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) 225 t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
226 226
227#endif /* __KERNEL__ */ 227#endif /* __KERNEL__ */
228 228
diff --git a/include/media/video-buf.h b/include/media/video-buf.h
index ae8d7a000440..ee8eb15c0ea6 100644
--- a/include/media/video-buf.h
+++ b/include/media/video-buf.h
@@ -177,7 +177,7 @@ struct videobuf_queue_ops {
177}; 177};
178 178
179struct videobuf_queue { 179struct videobuf_queue {
180 struct semaphore lock; 180 struct semaphore lock;
181 spinlock_t *irqlock; 181 spinlock_t *irqlock;
182 struct pci_dev *pci; 182 struct pci_dev *pci;
183 183