summaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
commitb2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch)
tree954a648692e7da983db1d2470953705f6a729264 /Documentation/video4linux
parentc9c06167e7933d93a6e396174c68abf242294abb (diff)
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r--Documentation/video4linux/bttv/Insmod-options1
-rw-r--r--Documentation/video4linux/bttv/Modules.conf4
-rw-r--r--Documentation/video4linux/bttv/README5
3 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options
index 4cb55586d..97b87f674 100644
--- a/Documentation/video4linux/bttv/Insmod-options
+++ b/Documentation/video4linux/bttv/Insmod-options
@@ -4,6 +4,7 @@ bttv.o
insmod args:
card=n card type, see CARDLIST for a list.
+ tuner=n tuner type, see CARDLIST for a list.
radio=0/1 card supports radio
pll=0/1/2 pll settings
0: don't use PLL
diff --git a/Documentation/video4linux/bttv/Modules.conf b/Documentation/video4linux/bttv/Modules.conf
index 84c79d659..55f14650d 100644
--- a/Documentation/video4linux/bttv/Modules.conf
+++ b/Documentation/video4linux/bttv/Modules.conf
@@ -9,7 +9,3 @@ alias char-major-81-0 bttv
options bttv card=2 radio=1
options tuner debug=1
-# make alsa + msp3400 play nicely
-options snd-card-ens snd_index=0
-options msp3400 mixer=1
-
diff --git a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README
index bce7e55ee..4af739a5c 100644
--- a/Documentation/video4linux/bttv/README
+++ b/Documentation/video4linux/bttv/README
@@ -31,8 +31,9 @@ Compile bttv
------------
If you are compiling the kernel version, just say 'm' if you are asked
-for bttv. I /strongly/ suggest to compile bttv as module, because
-there are some insmod options for configuring the driver.
+for bttv. I /strongly/ recommend to compile bttv as module, because
+there are some insmod options for configuring the driver. Starting
+with 0.7.49 the most important ones are available as kernel args too.
If you downloaded the separate bttv bundle: You need configured kernel
sources to compile the bttv driver. The driver uses some Makefile