diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2012-12-04 11:30:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-17 14:31:26 -0200 |
| commit | 8a4e786660f512b029b56d94d1b8f0201e67aab3 (patch) | |
| tree | f7d2f1d9ec023a20773cbb28e8e572946892774c /drivers/media/usb/au0828/au0828-i2c.c | |
| parent | c70ffd5968476ffe9fe2a8bfdc88956ecef92d2a (diff) | |
| download | lwn-8a4e786660f512b029b56d94d1b8f0201e67aab3.tar.gz lwn-8a4e786660f512b029b56d94d1b8f0201e67aab3.zip | |
[media] au0828: remove forced dependency of VIDEO_AU0828 on VIDEO_V4L2
This patch removes the dependendency of VIDEO_AU0828 on VIDEO_V4L2 by
creating a new Kconfig option, VIDEO_AU0828_V4L2, which enables analog
video capture support and depends on VIDEO_V4L2 itself.
With VIDEO_AU0828_V4L2 disabled, the driver will only support digital
television and will not depend on the v4l2-core. With VIDEO_AU0828_V4L2
enabled, the driver will be built with the analog v4l2 support included.
By default, the VIDEO_AU0828_V4L2 option will be set to Y, so as to
preserve the original behavior.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/au0828/au0828-i2c.c')
| -rw-r--r-- | drivers/media/usb/au0828/au0828-i2c.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/usb/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c index 4ded17fe1957..20d69b565255 100644 --- a/drivers/media/usb/au0828/au0828-i2c.c +++ b/drivers/media/usb/au0828/au0828-i2c.c @@ -378,7 +378,11 @@ int au0828_i2c_register(struct au0828_dev *dev) dev->i2c_adap.algo = &dev->i2c_algo; dev->i2c_adap.algo_data = dev; +#ifdef CONFIG_VIDEO_AU0828_V4L2 i2c_set_adapdata(&dev->i2c_adap, &dev->v4l2_dev); +#else + i2c_set_adapdata(&dev->i2c_adap, dev); +#endif i2c_add_adapter(&dev->i2c_adap); dev->i2c_client.adapter = &dev->i2c_adap; |