diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:59:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:59:34 -0300 |
| commit | 0e645f733be8728064b5fcbece38403a159a2636 (patch) | |
| tree | 75847b5e78f3a4493f1bb9658aa1e7048e3a43fe | |
| parent | c9eb88fca53978c15a4beea4bef308178cd1443a (diff) | |
| parent | 7de80935f4a24094229ebd0d7949c90ff99a56c6 (diff) | |
| download | mediapointer-dvb-s2-0e645f733be8728064b5fcbece38403a159a2636.tar.gz mediapointer-dvb-s2-0e645f733be8728064b5fcbece38403a159a2636.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/Kconfig | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/Makefile | 3 | ||||
| -rw-r--r-- | v4l/versions.txt | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index b9b38d9ff..1f7244cff 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/drivers/media/Kconfig @@ -71,13 +71,9 @@ 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 @@ -140,7 +136,6 @@ 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 a03f06c74..53d4dbf50 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -85,10 +85,11 @@ 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 +# tuner-types will be merged into tuner-simple, in the future +obj-$(CONFIG_TUNER_SIMPLE) += tuner-types.o obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o obj-$(CONFIG_TUNER_TDA8290) += tda8290.o obj-$(CONFIG_TUNER_TEA5767) += tea5767.o diff --git a/v4l/versions.txt b/v4l/versions.txt index 1637793c1..cb12bb229 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -203,7 +203,6 @@ DVB_TDA18271 VIDEO_SAA7146 VIDEO_SAA7146_VV VIDEO_TUNER -VIDEO_TUNER_TYPES VIDEO_BTCX VIDEO_IR VIDEO_TVEEPROM |