diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 13:32:41 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 13:32:41 +0200 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/media/video/gspca/spca508.c | |
| parent | TOMOYO: Fix infinite loop bug when reading /sys/kernel/security/tomoyo/audit (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| download | linux-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.xz linux-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.zip | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/media/video/gspca/spca508.c')
| -rw-r--r-- | drivers/media/video/gspca/spca508.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c index 348319371523..41dce49fb43d 100644 --- a/drivers/media/video/gspca/spca508.c +++ b/drivers/media/video/gspca/spca508.c @@ -592,7 +592,7 @@ static const u16 spca508_sightcam_init_data[][2] = { /* This line seems to setup the frame/canvas */ {0x000f, 0x8402}, -/* Theese 6 lines are needed to startup the webcam */ +/* These 6 lines are needed to startup the webcam */ {0x0090, 0x8110}, {0x0001, 0x8114}, {0x0001, 0x8114}, |