diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /drivers/media/video/gspca | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'drivers/media/video/gspca')
| -rw-r--r-- | drivers/media/video/gspca/sunplus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c index 21d82bab0c2e..9494f86b9a85 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/video/gspca/sunplus.c | |||
| @@ -805,7 +805,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
| 805 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ | 805 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ |
| 806 | spca504A_acknowledged_command(gspca_dev, 0x24, | 806 | spca504A_acknowledged_command(gspca_dev, 0x24, |
| 807 | 8, 3, 0x9e, 1); | 807 | 8, 3, 0x9e, 1); |
| 808 | /* Twice sequencial need status 0xff->0x9e->0x9d */ | 808 | /* Twice sequential need status 0xff->0x9e->0x9d */ |
| 809 | spca504A_acknowledged_command(gspca_dev, 0x24, | 809 | spca504A_acknowledged_command(gspca_dev, 0x24, |
| 810 | 8, 3, 0x9e, 0); | 810 | 8, 3, 0x9e, 0); |
| 811 | 811 | ||
| @@ -877,7 +877,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
| 877 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ | 877 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ |
| 878 | spca504A_acknowledged_command(gspca_dev, 0x24, | 878 | spca504A_acknowledged_command(gspca_dev, 0x24, |
| 879 | 8, 3, 0x9e, 1); | 879 | 8, 3, 0x9e, 1); |
| 880 | /* Twice sequencial need status 0xff->0x9e->0x9d */ | 880 | /* Twice sequential need status 0xff->0x9e->0x9d */ |
| 881 | spca504A_acknowledged_command(gspca_dev, 0x24, | 881 | spca504A_acknowledged_command(gspca_dev, 0x24, |
| 882 | 8, 3, 0x9e, 0); | 882 | 8, 3, 0x9e, 0); |
| 883 | spca504A_acknowledged_command(gspca_dev, 0x24, | 883 | spca504A_acknowledged_command(gspca_dev, 0x24, |