diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-05-05 16:11:32 -0700 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-05-05 16:11:32 -0700 |
| commit | 363704d53733c9e4b39840dbe7bedb49a24addb0 (patch) | |
| tree | 27aeaf68a513aa2d9c84e8dc4c0904c46ccf2960 /linux/drivers/media/video/cx88/cx88-vp3054-i2c.h | |
| parent | 6f863784f749dd51cf63bd6fa8fa6ff9dfb3f778 (diff) | |
| download | mediapointer-dvb-s2-363704d53733c9e4b39840dbe7bedb49a24addb0.tar.gz mediapointer-dvb-s2-363704d53733c9e4b39840dbe7bedb49a24addb0.tar.bz2 | |
cx88: VP3054 support can't be a module when cx88 is compiled in
From: Trent Piepho <xyzzy@speakeasy.org>
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>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-vp3054-i2c.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-vp3054-i2c.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.h b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.h index 637a7d232..be99c931d 100644 --- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.h +++ b/linux/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 |