summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-10-12 04:02:08 +0000
committerMichael Krufky <devnull@localhost>2005-10-12 04:02:08 +0000
commit723e8923174092825f6ffe13559fe0abc6f38552 (patch)
tree963ebbbe1a0cd70aa4785e72659f68b0cb94ee86 /linux
parent4bb3fbe1741d0b0e1f04eab0558c60435f847d98 (diff)
downloadmediapointer-dvb-s2-723e8923174092825f6ffe13559fe0abc6f38552.tar.gz
mediapointer-dvb-s2-723e8923174092825f6ffe13559fe0abc6f38552.tar.bz2
* ../v4l/scripts/strip-trailing-whitespaces.sh:
- Updated script to function in new tree layout. Must be called from top-level. * ../Makefile: - Automatically strip trailing whitespaces before creating Changelog entry.
Diffstat (limited to 'linux')
-rw-r--r--linux/Documentation/video4linux/README.cx882
-rw-r--r--linux/Documentation/video4linux/README.saa71342
-rw-r--r--linux/Documentation/video4linux/bttv/Sound-FAQ6
-rw-r--r--linux/Documentation/video4linux/bttv/Tuners4
-rw-r--r--linux/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt2
-rw-r--r--linux/Documentation/video4linux/lifeview.txt4
-rw-r--r--linux/drivers/media/video/ir-kbd-i2c.c4
-rw-r--r--linux/drivers/media/video/wm8775.c2
8 files changed, 13 insertions, 13 deletions
diff --git a/linux/Documentation/video4linux/README.cx88 b/linux/Documentation/video4linux/README.cx88
index 897ab8348..0b93455bb 100644
--- a/linux/Documentation/video4linux/README.cx88
+++ b/linux/Documentation/video4linux/README.cx88
@@ -65,5 +65,5 @@ Have fun,
Gerd
---
+--
Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
diff --git a/linux/Documentation/video4linux/README.saa7134 b/linux/Documentation/video4linux/README.saa7134
index 1f788e498..b911f0871 100644
--- a/linux/Documentation/video4linux/README.saa7134
+++ b/linux/Documentation/video4linux/README.saa7134
@@ -78,5 +78,5 @@ Have fun,
Gerd
---
+--
Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
diff --git a/linux/Documentation/video4linux/bttv/Sound-FAQ b/linux/Documentation/video4linux/bttv/Sound-FAQ
index b8c9c2605..5c9822492 100644
--- a/linux/Documentation/video4linux/bttv/Sound-FAQ
+++ b/linux/Documentation/video4linux/bttv/Sound-FAQ
@@ -129,8 +129,8 @@ tuner_type - same as tuner= insmod option
module loaded to work properly.
has_radio - whenever this TV card has a radio tuner.
no_msp34xx - "1" disables loading of msp3400.o module
-no_tda9875 - "1" disables loading of tda9875.o module
-needs_tvaudio - set to "1" to load tvaudio.o module
+no_tda9875 - "1" disables loading of tda9875.o module
+needs_tvaudio - set to "1" to load tvaudio.o module
If some config item is specified both from the tvcards array and as
insmod option, the insmod option takes precedence.
@@ -144,5 +144,5 @@ Good luck,
PS: If you have a new working entry, mail it to me.
---
+--
Gerd Knorr <kraxel@bytesex.org>
diff --git a/linux/Documentation/video4linux/bttv/Tuners b/linux/Documentation/video4linux/bttv/Tuners
index d18fbc70c..0a371d349 100644
--- a/linux/Documentation/video4linux/bttv/Tuners
+++ b/linux/Documentation/video4linux/bttv/Tuners
@@ -21,7 +21,7 @@ SAMSUNG Tuner identification: (e.g. TCPM9091PD27)
J= NTSC-Japan
L= Secam LL
M= BG+I+DK
- N= NTSC
+ N= NTSC
Q= BG+I+DK+LL
[89]: ?
[125]:
@@ -96,7 +96,7 @@ LG Innotek Tuner:
TADC-H002F: NTSC (L,175/410?; 2-B, C-W+11, W+12-69)
TADC-M201D: PAL D/K+B/G+I (L,143/425) (sound control at I2C address 0xc8)
TADC-T003F: NTSC Taiwan (L,175/410?; 2-B, C-W+11, W+12-69)
- Suffix:
+ Suffix:
P= Standard phono female socket
D= IEC female socket
F= F-connector
diff --git a/linux/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt b/linux/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
index 1ece85e57..93fec32a1 100644
--- a/linux/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
+++ b/linux/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
@@ -1,6 +1,6 @@
The controls for the mux are GPIO [0,1] for source, and GPIO 2 for muting.
-GPIO0 GPIO1
+GPIO0 GPIO1
0 0 TV Audio
1 0 FM radio
0 1 Line-In
diff --git a/linux/Documentation/video4linux/lifeview.txt b/linux/Documentation/video4linux/lifeview.txt
index 44d3e53b5..b07ea79c2 100644
--- a/linux/Documentation/video4linux/lifeview.txt
+++ b/linux/Documentation/video4linux/lifeview.txt
@@ -3,8 +3,8 @@ gpio pins 0-9 ...
==================================================================
bt878:
- LR50 rev. Q ("PARTS: 7031505116), Tuner wurde als Nr. 5 erkannt, Eingänge
- SVideo, TV, Composite, Audio, Remote. CP9..1=100001001 (1: 0-Ohm-Widerstand
+ LR50 rev. Q ("PARTS: 7031505116), Tuner wurde als Nr. 5 erkannt, Eingänge
+ SVideo, TV, Composite, Audio, Remote. CP9..1=100001001 (1: 0-Ohm-Widerstand
gegen GND unbestückt; 0: bestückt)
------------------------------------------------------------------------------
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c
index a09c45170..8be36fa1d 100644
--- a/linux/drivers/media/video/ir-kbd-i2c.c
+++ b/linux/drivers/media/video/ir-kbd-i2c.c
@@ -1,5 +1,5 @@
/*
- * $Id: ir-kbd-i2c.c,v 1.15 2005/10/11 02:52:03 mrechberger Exp $
+ * $Id: ir-kbd-i2c.c,v 1.16 2005/10/12 04:02:08 mkrufky Exp $
*
* keyboard input driver for i2c IR remote controls
*
@@ -65,7 +65,7 @@ static IR_KEYTAB_TYPE ir_codes_em2820[IR_KEYTAB_SIZE] = {
[ 15 ] = KEY_VOLUMEUP,
[ 16 ] = KEY_KP0,
[ 17 ] = KEY_MENU,
- [ 18 ] = KEY_PRINT,
+ [ 18 ] = KEY_PRINT,
[ 19 ] = KEY_VOLUMEDOWN,
[ 21 ] = KEY_PAUSE,
diff --git a/linux/drivers/media/video/wm8775.c b/linux/drivers/media/video/wm8775.c
index 841d2989f..204685dab 100644
--- a/linux/drivers/media/video/wm8775.c
+++ b/linux/drivers/media/video/wm8775.c
@@ -75,7 +75,7 @@ static int wm8775_write(struct i2c_client *client, int reg, u16 val)
}
for (i = 0; i < 3; i++) {
- if (i2c_smbus_write_byte_data(client, (reg << 1) |
+ if (i2c_smbus_write_byte_data(client, (reg << 1) |
(val >> 8), val & 0xff) == 0) {
return 0;
}