diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index a33a58da016e..4c4e58004f54 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
29 | #include <media/videobuf-vmalloc.h> | 29 | #include <media/videobuf-vmalloc.h> |
30 | #include <media/v4l2-device.h> | ||
30 | 31 | ||
31 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
32 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
@@ -385,6 +386,8 @@ struct em28xx_board { | |||
385 | unsigned int valid:1; | 386 | unsigned int valid:1; |
386 | 387 | ||
387 | unsigned char xclk, i2c_speed; | 388 | unsigned char xclk, i2c_speed; |
389 | unsigned char radio_addr; | ||
390 | unsigned short tvaudio_addr; | ||
388 | 391 | ||
389 | enum em28xx_decoder decoder; | 392 | enum em28xx_decoder decoder; |
390 | enum em28xx_adecoder adecoder; | 393 | enum em28xx_adecoder adecoder; |
@@ -460,6 +463,7 @@ struct em28xx { | |||
460 | int devno; /* marks the number of this device */ | 463 | int devno; /* marks the number of this device */ |
461 | enum em28xx_chip_id chip_id; | 464 | enum em28xx_chip_id chip_id; |
462 | 465 | ||
466 | struct v4l2_device v4l2_dev; | ||
463 | struct em28xx_board board; | 467 | struct em28xx_board board; |
464 | 468 | ||
465 | unsigned int stream_on:1; /* Locks streams */ | 469 | unsigned int stream_on:1; /* Locks streams */ |
@@ -577,11 +581,9 @@ struct em28xx_ops { | |||
577 | }; | 581 | }; |
578 | 582 | ||
579 | /* Provided by em28xx-i2c.c */ | 583 | /* Provided by em28xx-i2c.c */ |
580 | |||
581 | void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg); | ||
582 | void em28xx_do_i2c_scan(struct em28xx *dev); | 584 | void em28xx_do_i2c_scan(struct em28xx *dev); |
583 | int em28xx_i2c_register(struct em28xx *dev); | 585 | int em28xx_i2c_register(struct em28xx *dev); |
584 | int em28xx_i2c_unregister(struct em28xx *dev); | 586 | int em28xx_i2c_unregister(struct em28xx *dev); |
585 | 587 | ||
586 | /* Provided by em28xx-core.c */ | 588 | /* Provided by em28xx-core.c */ |
587 | 589 | ||