diff options
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-input.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index e776699b62f9..6d2e4a6f8b2b 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -1842,7 +1842,7 @@ void em28xx_release_resources(struct em28xx *dev) | |||
1842 | * em28xx_init_dev() | 1842 | * em28xx_init_dev() |
1843 | * allocates and inits the device structs, registers i2c bus and v4l device | 1843 | * allocates and inits the device structs, registers i2c bus and v4l device |
1844 | */ | 1844 | */ |
1845 | int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | 1845 | static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, |
1846 | int minor) | 1846 | int minor) |
1847 | { | 1847 | { |
1848 | struct em28xx *dev = *devhandle; | 1848 | struct em28xx *dev = *devhandle; |
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 819cceaa6ef4..eb5fb05fab22 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
@@ -393,7 +393,7 @@ static int em28xx_set_audio_source(struct em28xx *dev) | |||
393 | return ret; | 393 | return ret; |
394 | } | 394 | } |
395 | 395 | ||
396 | struct em28xx_vol_table outputs[] = { | 396 | static const struct em28xx_vol_table outputs[] = { |
397 | { EM28XX_AOUT_MASTER, AC97_MASTER_VOL }, | 397 | { EM28XX_AOUT_MASTER, AC97_MASTER_VOL }, |
398 | { EM28XX_AOUT_LINE, AC97_LINE_LEVEL_VOL }, | 398 | { EM28XX_AOUT_LINE, AC97_LINE_LEVEL_VOL }, |
399 | { EM28XX_AOUT_MONO, AC97_MASTER_MONO_VOL }, | 399 | { EM28XX_AOUT_MONO, AC97_MASTER_MONO_VOL }, |
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c index 42bbaf64aceb..0443afe09ff8 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/video/em28xx/em28xx-input.c | |||
@@ -307,7 +307,7 @@ static void em28xx_ir_work(struct work_struct *work) | |||
307 | mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling)); | 307 | mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling)); |
308 | } | 308 | } |
309 | 309 | ||
310 | void em28xx_ir_start(struct em28xx_IR *ir) | 310 | static void em28xx_ir_start(struct em28xx_IR *ir) |
311 | { | 311 | { |
312 | setup_timer(&ir->timer, ir_timer, (unsigned long)ir); | 312 | setup_timer(&ir->timer, ir_timer, (unsigned long)ir); |
313 | INIT_WORK(&ir->work, em28xx_ir_work); | 313 | INIT_WORK(&ir->work, em28xx_ir_work); |