diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 23:41:22 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 23:41:22 (GMT) |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /Documentation/video4linux/bttv/Insmod-options | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
| download | linux-fsl-qoriq-9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95.tar.xz | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'Documentation/video4linux/bttv/Insmod-options')
| -rw-r--r-- | Documentation/video4linux/bttv/Insmod-options | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options index 5ef7578..bbe3ed6 100644 --- 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*). |