summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Kconfig.sound26
-rw-r--r--v4l/Makefile.sound11
2 files changed, 0 insertions, 37 deletions
diff --git a/v4l/Kconfig.sound b/v4l/Kconfig.sound
index 597c9c72b..55be75cce 100644
--- a/v4l/Kconfig.sound
+++ b/v4l/Kconfig.sound
@@ -45,30 +45,4 @@ config SND_FM801_TEA575X
This will enable support for the old V4L1 API.
-# This is part of sound/oss/Kconfig
-comment "OSS sound"
-
-config SOUND_BT878
- tristate "BT878 audio dma"
- depends on SOUND_PRIME && PCI
- ---help---
- Audio DMA support for bt878 based grabber boards. As you might have
- already noticed, bt878 is listed with two functions in /proc/pci.
- Function 0 does the video stuff (bt848 compatible), function 1 does
- the same for audio data. This is a driver for the audio part of
- the chip. If you say 'Y' here you get a oss-compatible dsp device
- where you can record from. If you want just watch TV you probably
- don't need this driver as most TV cards handle sound with a short
- cable from the TV card to your sound card's line-in.
-
- To compile this driver as a module, choose M here: the module will
- be called btaudio.
-
-config SOUND_TVMIXER
- tristate "TV card (bt848) mixer support"
- depends on SOUND_PRIME && I2C && VIDEO_V4L1
- help
- Support for audio mixer facilities on the BT848 TV frame-grabber
- card.
-
endmenu
diff --git a/v4l/Makefile.sound b/v4l/Makefile.sound
index 941dbc65c..38e868629 100644
--- a/v4l/Makefile.sound
+++ b/v4l/Makefile.sound
@@ -3,10 +3,6 @@
snd-bt87x-objs := bt87x.o
obj-$(CONFIG_SND_BT87X) += snd-bt87x.o
-# From sound/oss/Makefile
-
-obj-$(CONFIG_SOUND_BT878) += btaudio.o
-
# From sound/i2c/other/Makefile
snd-tea575x-tuner-objs := tea575x-tuner.o
obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o
@@ -22,13 +18,6 @@ sound-install install-sound::
for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
- @dir="sound/oss"; \
- files='btaudio.ko'; \
- echo -e "\nInstalling $(KDIRA)/$$dir files:"; \
- install -d $(KDIRA)/$$dir; \
- for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
- install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
-
@dir="sound/i2c/other"; \
files='snd-tea575x-tuner.ko'; \
echo -e "\nInstalling $(KDIRA)/$$dir files:"; \