Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-25 14:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert conflicting V4L changes

Browse Source 
This is a partial revert of b595076a18
("tree-wide: fix comment/printk typos"), as it changes the code
that no longer exists in linux-next.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Jiri Kosina 2010-12-28 14:16:15 +01:00
parent e7bf068aa3
commit bb9fb42029
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/zoran/zoran.h
View File

@ -95,7 +95,7 @@ struct zoran_params {
int quality; /* Measure for quality of compressed images.
* Scales linearly with the size of the compressed images.
* Must be between 0 and 100, 100 is a compression
* Must be beetween 0 and 100, 100 is a compression
* ratio of 1:4 */
int odd_even; /* Which field should come first ??? */

2
drivers/staging/stradis/stradis.c
View File

@ -745,7 +745,7 @@ static void set_out_format(struct saa7146 *saa, int mode)
}
}
/* Initialize bitmangler to map from a byte value to the mangled word that
/* Intialize bitmangler to map from a byte value to the mangled word that
* must be output to program the Xilinx part through the DEBI port.
* Xilinx Data Bit->DEBI Bit: 0->15 1->7 2->6 3->12 4->11 5->2 6->1 7->0
* transfer FPGA code, init IBM chip, transfer IBM microcode