diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-01-27 18:18:04 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-01-27 18:18:04 -0500 |
| commit | cf7557e23cb16338cdbcfa4075ff34ebf2ba0ca5 (patch) | |
| tree | 969c73bc5819796ce91ed096d9552c8ba4effd2d /linux | |
| parent | 6115a22c6160858176408cd0bc3622f46db6b012 (diff) | |
| download | mediapointer-dvb-s2-cf7557e23cb16338cdbcfa4075ff34ebf2ba0ca5.tar.gz mediapointer-dvb-s2-cf7557e23cb16338cdbcfa4075ff34ebf2ba0ca5.tar.bz2 | |
tuner: build tuner-types independently of tuner-core
From: Michael Krufky <mkrufky@linuxtv.org>
tuner-types is needed for tuner-simple, and does not need to be bound
to tuner-core. Any caller of tuner-simple, including tuner-core, needs
to pass a structure from tuner-types into tuner-simple at attach-time.
Export the two needed symbols from tuner-types for now, so that card-level
drivers can attach tuner-simple for hybrid dvb_frontend devices. We will
remove this dependency altogether as tuner refactoring phase 3 progresses.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/Kconfig | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/Makefile | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-types.c | 14 |
3 files changed, 21 insertions, 1 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index 8f4a45346..0bf2fb1fa 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/drivers/media/Kconfig @@ -66,9 +66,13 @@ source "drivers/media/dvb/Kconfig" source "drivers/media/common/Kconfig" +config VIDEO_TUNER_TYPES + tristate + config VIDEO_TUNER tristate depends on I2C + select VIDEO_TUNER_TYPES select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE @@ -131,6 +135,7 @@ config TUNER_TEA5767 config TUNER_SIMPLE tristate "Simple tuner support" depends on I2C + select VIDEO_TUNER_TYPES select TUNER_TDA9887 default m if VIDEO_TUNER_CUSTOMIZE help diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 28ddd146c..e202d2a0c 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -4,7 +4,7 @@ zr36067-objs := zoran_procfs.o zoran_device.o \ zoran_driver.o zoran_card.o -tuner-objs := tuner-core.o tuner-types.o +tuner-objs := tuner-core.o msp3400-objs := msp3400-driver.o msp3400-kthreads.o @@ -84,6 +84,7 @@ obj-$(CONFIG_VIDEO_DPC) += dpc7146.o obj-$(CONFIG_TUNER_3036) += tuner-3036.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o +obj-$(CONFIG_VIDEO_TUNER_TYPES) += tuner-types.o obj-$(CONFIG_TUNER_XC2028) += tuner-xc2028.o obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o diff --git a/linux/drivers/media/video/tuner-types.c b/linux/drivers/media/video/tuner-types.c index 8b78a2140..2e93a9c57 100644 --- a/linux/drivers/media/video/tuner-types.c +++ b/linux/drivers/media/video/tuner-types.c @@ -1528,5 +1528,19 @@ struct tunertype tuners[] = { /* see xc5000.c for details */ }, }; +EXPORT_SYMBOL(tuners); unsigned const int tuner_count = ARRAY_SIZE(tuners); +EXPORT_SYMBOL(tuner_count); + +MODULE_DESCRIPTION("Simple tuner device type database"); +MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer"); +MODULE_LICENSE("GPL"); + +/* + * Overrides for Emacs so that we follow Linus's tabbing style. + * --------------------------------------------------------------------------- + * Local variables: + * c-basic-offset: 8 + * End: + */ |