diff options
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/audiochip.h | 16 | ||||
| -rw-r--r-- | linux/include/media/i2c-compat.h | 4 | ||||
| -rw-r--r-- | linux/include/media/saa6752hs.h | 2 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 10 | ||||
| -rw-r--r-- | linux/include/media/video-buf.h | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/linux/include/media/audiochip.h b/linux/include/media/audiochip.h index ed7a2e096..0807ea262 100644 --- a/linux/include/media/audiochip.h +++ b/linux/include/media/audiochip.h @@ -1,5 +1,5 @@ /* - * $Id: audiochip.h,v 1.6 2005/10/02 11:42:43 mchehab Exp $ + * $Id: audiochip.h,v 1.7 2005/10/16 12:13:58 mchehab Exp $ */ #ifndef AUDIOCHIP_H @@ -11,13 +11,13 @@ enum audiochip { /* Provided by video chip */ AUDIO_CHIP_INTERNAL, /* Provided by tvaudio.c */ - AUDIO_CHIP_TDA8425, - AUDIO_CHIP_TEA6300, - AUDIO_CHIP_TEA6420, - AUDIO_CHIP_TDA9840, - AUDIO_CHIP_TDA985X, - AUDIO_CHIP_TDA9874, - AUDIO_CHIP_PIC16C54, + AUDIO_CHIP_TDA8425, + AUDIO_CHIP_TEA6300, + AUDIO_CHIP_TEA6420, + AUDIO_CHIP_TDA9840, + AUDIO_CHIP_TDA985X, + AUDIO_CHIP_TDA9874, + AUDIO_CHIP_PIC16C54, /* Provided by msp3400.c */ AUDIO_CHIP_MSP34XX }; diff --git a/linux/include/media/i2c-compat.h b/linux/include/media/i2c-compat.h index 4f8fbd022..39fa183fa 100644 --- a/linux/include/media/i2c-compat.h +++ b/linux/include/media/i2c-compat.h @@ -1,5 +1,5 @@ /* - * $Id: i2c-compat.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $ + * $Id: i2c-compat.h,v 1.3 2005/10/16 12:13:58 mchehab Exp $ * * some i2c layer compatibility stuff -- to avoid cluttering up the * i2c modules with tons of #ifdefs @@ -19,7 +19,7 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data) static inline void *i2c_get_clientdata(struct i2c_client *dev) { - return dev->data; + return dev->data; } static inline void i2c_set_clientdata(struct i2c_client *dev, void *data) diff --git a/linux/include/media/saa6752hs.h b/linux/include/media/saa6752hs.h index 791bad2b8..3f81c0d9e 100644 --- a/linux/include/media/saa6752hs.h +++ b/linux/include/media/saa6752hs.h @@ -56,7 +56,7 @@ struct mpeg_params { enum mpeg_audio_bitrate audio_bitrate; unsigned int total_bitrate; - unsigned int pmt_pid; + unsigned int pmt_pid; unsigned int video_pid; unsigned int audio_pid; unsigned int pcr_pid; diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 9cc9cf396..4dadb1ea0 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,4 +1,4 @@ -/* $Id: tuner.h,v 1.56 2005/10/15 13:13:42 nsh Exp $ +/* $Id: tuner.h,v 1.57 2005/10/16 12:13:58 mchehab Exp $ * tuner.h - definition for different tuners @@ -216,14 +216,14 @@ extern int tea5767_autodetection(struct i2c_client *c); #define tuner_warn(fmt, arg...) do {\ printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \ - t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) + t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) #define tuner_info(fmt, arg...) do {\ printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \ - t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) + t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) #define tuner_dbg(fmt, arg...) do {\ if (tuner_debug) \ - printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \ - t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) + printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \ + t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) #endif /* __KERNEL__ */ diff --git a/linux/include/media/video-buf.h b/linux/include/media/video-buf.h index ae6da6de9..d5297072d 100644 --- a/linux/include/media/video-buf.h +++ b/linux/include/media/video-buf.h @@ -1,5 +1,5 @@ /* - * $Id: video-buf.h,v 1.9 2004/11/07 13:17:15 kraxel Exp $ + * $Id: video-buf.h,v 1.10 2005/10/16 12:13:58 mchehab Exp $ * * generic helper functions for video4linux capture buffers, to handle * memory management and PCI DMA. Right now bttv + saa7134 use it. @@ -178,7 +178,7 @@ struct videobuf_queue_ops { }; struct videobuf_queue { - struct semaphore lock; + struct semaphore lock; spinlock_t *irqlock; struct pci_dev *pci; |