diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-05-05 20:11:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 14:23:11 -0300 |
| commit | ecf854df72847d90d5e44b6676a855677b5a33df (patch) | |
| tree | 2e59138ddee1c1799042d34baeda8f8f1b5cc981 /drivers/media/video/cx88/cx88-vp3054-i2c.h | |
| parent | 8573a9e6a8ed724b7e3074dc8762d4117ed0b3aa (diff) | |
| download | linux-ecf854df72847d90d5e44b6676a855677b5a33df.tar.gz | |
V4L/DVB (5629): Cx88: VP3054 support can't be a module when cx88 is compiled in
If cx88 support is compiled into the kernel while vp3054 is left as a module,
the kernel will fail to link. Adjust the existing "#if" code in cx88 so
that it won't consider vp3054 to be supported in this case.
It might make sense to move vp3054 selection into the "customisation" menu
instead of a cx88 sub-option (though this is a cx88 feature, there is no extra
chip involved).
It might also make sense to use dvb_attach() to load vp3054 support.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-vp3054-i2c.h')
| -rw-r--r-- | drivers/media/video/cx88/cx88-vp3054-i2c.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.h b/drivers/media/video/cx88/cx88-vp3054-i2c.h index 637a7d2322389c..be99c931dc3e24 100644 --- a/drivers/media/video/cx88/cx88-vp3054-i2c.h +++ b/drivers/media/video/cx88/cx88-vp3054-i2c.h @@ -30,5 +30,12 @@ struct vp3054_i2c_state { }; /* ----------------------------------------------------------------------- */ +#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE)) int vp3054_i2c_probe(struct cx8802_dev *dev); void vp3054_i2c_remove(struct cx8802_dev *dev); +#else +static inline int vp3054_i2c_probe(struct cx8802_dev *dev) +{ return 0; } +static inline void vp3054_i2c_remove(struct cx8802_dev *dev) +{ } +#endif |