diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /drivers/media/video/saa7134/saa6752hs.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/media/video/saa7134/saa6752hs.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa6752hs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index 1fb6eccdade3..1fee6e84a512 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
| @@ -838,7 +838,7 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
| 838 | h->standard = *((v4l2_std_id *) arg); | 838 | h->standard = *((v4l2_std_id *) arg); |
| 839 | break; | 839 | break; |
| 840 | 840 | ||
| 841 | case VIDIOC_G_CHIP_IDENT: | 841 | case VIDIOC_DBG_G_CHIP_IDENT: |
| 842 | return v4l2_chip_ident_i2c_client(client, | 842 | return v4l2_chip_ident_i2c_client(client, |
| 843 | arg, h->chip, h->revision); | 843 | arg, h->chip, h->revision); |
| 844 | 844 | ||