diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-28 14:16:15 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-28 14:16:15 +0100 |
| commit | bb9fb42029abcc90c265dbc40cab106421dd9348 (patch) | |
| tree | f387ca82e382c13092a368a1ea7ba42ae2d983eb | |
| parent | e7bf068aa3208d73e9dea817f6d975071ddd4336 (diff) | |
| download | op-kernel-dev-bb9fb42029abcc90c265dbc40cab106421dd9348.zip op-kernel-dev-bb9fb42029abcc90c265dbc40cab106421dd9348.tar.gz | |
Revert conflicting V4L changes
This is a partial revert of b595076a180a56d1bb1
("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>
| -rw-r--r-- | drivers/media/video/zoran/zoran.h | 2 | ||||
| -rw-r--r-- | drivers/staging/stradis/stradis.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h index b336259..27f0555 100644 --- a/drivers/media/video/zoran/zoran.h +++ b/drivers/media/video/zoran/zoran.h @@ -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 ??? */ diff --git a/drivers/staging/stradis/stradis.c b/drivers/staging/stradis/stradis.c index 2e74355..807dd7e 100644 --- a/drivers/staging/stradis/stradis.c +++ b/drivers/staging/stradis/stradis.c @@ -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 |
