diff options
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-alsa.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvp5150.c | 2 | ||||
| -rw-r--r-- | v4l/ChangeLog | 12 |
4 files changed, 18 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index e27027675..42e758c93 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -50,7 +50,7 @@ static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif -int cx25840_debug; +static int cx25840_debug; #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) module_param_named(debug,cx25840_debug, int, 0644); diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c index 891266e93..6af5ae759 100644 --- a/linux/drivers/media/video/cx88/cx88-alsa.c +++ b/linux/drivers/media/video/cx88/cx88-alsa.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-alsa.c,v 1.30 2006/01/15 08:45:20 mchehab Exp $ + * $Id: cx88-alsa.c,v 1.31 2006/01/15 08:56:15 mchehab Exp $ * * Support for audio capture * PCI function #1 of the cx2388x. @@ -142,7 +142,7 @@ MODULE_PARM_DESC(debug,"enable debug messages"); * BOARD Specific: Sets audio DMA */ -int _cx88_start_audio_dma(snd_cx88_card_t *chip) +static int _cx88_start_audio_dma(snd_cx88_card_t *chip) { struct cx88_buffer *buf = chip->buf; struct cx88_core *core=chip->core; @@ -187,7 +187,7 @@ int _cx88_start_audio_dma(snd_cx88_card_t *chip) /* * BOARD Specific: Resets audio DMA */ -int _cx88_stop_audio_dma(snd_cx88_card_t *chip) +static int _cx88_stop_audio_dma(snd_cx88_card_t *chip) { struct cx88_core *core=chip->core; dprintk(1, "Stopping audio DMA\n"); @@ -627,7 +627,7 @@ static snd_kcontrol_new_t snd_cx88_capture_volume = { * Only boards with eeprom and byte 1 at eeprom=1 have it */ -struct pci_device_id cx88_audio_pci_tbl[] = { +static struct pci_device_id cx88_audio_pci_tbl[] = { {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0, } diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index bea373ec4..3fa59ff8f 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -658,7 +658,7 @@ struct i2c_vbi_ram_value { unsigned char values[26]; }; -struct i2c_vbi_ram_value vbi_ram_default[] = +static struct i2c_vbi_ram_value vbi_ram_default[] = { {0x010, /* WST SECAM 6 */ { 0xaa, 0xaa, 0xff, 0xff , 0xe7, 0x2e, 0x20, 0x26, 0xe6, 0xb4, 0x0e, 0x0, 0x0, 0x0, 0x10, 0x0 } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index bea687fc1..b42a5ebbd 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2006-01-15 08:54 mchehab + + * linux/drivers/media/video/cx25840/cx25840-core.c: + * linux/drivers/media/video/cx88/cx88-alsa.c: + (_cx88_start_audio_dma), (_cx88_stop_audio_dma): + * linux/drivers/media/video/tvp5150.c: + + - This patch makes some needlessly global code static. + + Signed-off-by: Adrian Bunk <bunk@stusta.de> + Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> + 2006-01-15 08:47 mchehab * linux/drivers/media/video/cx88/Kconfig: |