diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/media/video/s2255drv.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/media/video/s2255drv.c')
| -rw-r--r-- | drivers/media/video/s2255drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index 2c0bb06cab3b..03d39266d293 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
| @@ -1980,7 +1980,7 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info) | |||
| 1980 | wake_up(&dev->fw_data->wait_fw); | 1980 | wake_up(&dev->fw_data->wait_fw); |
| 1981 | break; | 1981 | break; |
| 1982 | default: | 1982 | default: |
| 1983 | printk(KERN_INFO "s2255 unknwn resp\n"); | 1983 | printk(KERN_INFO "s2255 unknown resp\n"); |
| 1984 | } | 1984 | } |
| 1985 | default: | 1985 | default: |
| 1986 | pdata++; | 1986 | pdata++; |