summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-06 13:29:09 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-03-06 13:29:09 +0100
commit2b325438911b426807991cb0cbe94fa3c30d087c (patch)
tree9305edd4302fbc062854b68b02575ca84827b3bc
parent49e8c2b4c9396a7d75bde724d497fdddd09f0ab2 (diff)
downloadmediapointer-dvb-s2-2b325438911b426807991cb0cbe94fa3c30d087c.tar.gz
mediapointer-dvb-s2-2b325438911b426807991cb0cbe94fa3c30d087c.tar.bz2
tvmixer: remove last remaining references to this deleted module.
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--linux/Documentation/video4linux/bttv/Insmod-options10
-rw-r--r--linux/drivers/media/video/Makefile1
-rwxr-xr-xv4l/scripts/release.sh2
3 files changed, 1 insertions, 12 deletions
diff --git a/linux/Documentation/video4linux/bttv/Insmod-options b/linux/Documentation/video4linux/bttv/Insmod-options
index 5ef75787f..bbe3ed667 100644
--- a/linux/Documentation/video4linux/bttv/Insmod-options
+++ b/linux/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/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 307490ebc..08a0675fe 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/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
diff --git a/v4l/scripts/release.sh b/v4l/scripts/release.sh
index 5055675d6..19916545c 100755
--- a/v4l/scripts/release.sh
+++ b/v4l/scripts/release.sh
@@ -14,7 +14,7 @@ files_common="$files_v4l $files_tuner $files_i2c doc"
# other files
files_ir="ir-common.[ch]"
-files_audio="msp3400.[ch] tvaudio.[ch] tvmixer.[ch]"
+files_audio="msp3400.[ch] tvaudio.[ch]"
files_bttv="bt848.h btcx*.[ch] bttv*.[ch] ir-kbd*.c"
files_saa="saa7134*.[ch] saa6752hs.[ch] ir-kbd-i2c.c"