V4L/DVB (10909): tvmixer: remove last remaining references to this deleted module.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options
index 5ef75787f83a271c3916614d61549c87b5087af3..bbe3ed667d911a1a6fa06646f21b22fe34c464aa 100644 (file)
--- a/Documentation/video4linux/bttv/Insmod-options
+++ b/Documentation/video4linux/bttv/Insmod-options
@@ -81,16 +81,6 @@ tuner.o
                pal=[bdgil]     select PAL variant (used for some tuners
                                only, important for the audio carrier).
 
-tvmixer.o
-       registers a mixer device for the TV card's volume/bass/treble
-       controls (requires a i2c audio control chip like the msp3400).
-
-       insmod args:
-               debug=1         print some debug info to the syslog.
-               devnr=n         allocate device #n (0 == /dev/mixer,
-                               1 = /dev/mixer1, ...), default is to
-                               use the first free one.
-
 tvaudio.o
        new, experimental module which is supported to provide a single
        driver for all simple i2c audio control chips (tda/tea*).

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 307490ebc230ca8c6414ed1f284ad0a649084b18..08a0675fea34a4a351034dcd8fafc426e48e498d 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -30,7 +30,6 @@ obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
 obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
 obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o
-obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o
 obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o