diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-06 07:29:09 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:15 -0400 |
commit | cf5193c74009e33428daefbf74f4770733c8ee36 (patch) | |
tree | b0bd9705cdd8a1092c1ef26490a65cd74fb701ef | |
parent | 7e0a16f6118a297dd467c1e5a0908429fcdf56af (diff) |
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>
-rw-r--r-- | Documentation/video4linux/bttv/Insmod-options | 10 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options index 5ef75787f83a..bbe3ed667d91 100644 --- a/Documentation/video4linux/bttv/Insmod-options +++ b/Documentation/video4linux/bttv/Insmod-options | |||
@@ -81,16 +81,6 @@ tuner.o | |||
81 | pal=[bdgil] select PAL variant (used for some tuners | 81 | pal=[bdgil] select PAL variant (used for some tuners |
82 | only, important for the audio carrier). | 82 | only, important for the audio carrier). |
83 | 83 | ||
84 | tvmixer.o | ||
85 | registers a mixer device for the TV card's volume/bass/treble | ||
86 | controls (requires a i2c audio control chip like the msp3400). | ||
87 | |||
88 | insmod args: | ||
89 | debug=1 print some debug info to the syslog. | ||
90 | devnr=n allocate device #n (0 == /dev/mixer, | ||
91 | 1 = /dev/mixer1, ...), default is to | ||
92 | use the first free one. | ||
93 | |||
94 | tvaudio.o | 84 | tvaudio.o |
95 | new, experimental module which is supported to provide a single | 85 | new, experimental module which is supported to provide a single |
96 | driver for all simple i2c audio control chips (tda/tea*). | 86 | driver for all simple i2c audio control chips (tda/tea*). |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 307490ebc230..08a0675fea34 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -30,7 +30,6 @@ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o | |||
30 | obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o | 30 | obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o |
31 | obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o | 31 | obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o |
32 | obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o | 32 | obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o |
33 | obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o | ||
34 | 33 | ||
35 | obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o | 34 | obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o |
36 | obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o | 35 | obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o |