diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
| commit | d6fa4ec20db6bd0b403d2d99fd9423e6c0f3f845 (patch) | |
| tree | e9ddb16309d2b546a400593afc07846ce9ed6746 /include/media/v4l2-chip-ident.h | |
| parent | dc1cfc34b2a07c5441d68ca21ae4296822ee4df6 (diff) | |
| parent | 1ff6b9489fbc737e3e2bc7660b92cebbfaea5247 (diff) | |
Conflicts:
arch/arm/mach-tegra/common.c
drivers/ata/ahci-tegra.c
Diffstat (limited to 'include/media/v4l2-chip-ident.h')
| -rw-r--r-- | include/media/v4l2-chip-ident.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h index 63fd9d3db296..fb929eacd2e6 100644 --- a/include/media/v4l2-chip-ident.h +++ b/include/media/v4l2-chip-ident.h @@ -77,6 +77,7 @@ enum { V4L2_IDENT_OV2640 = 259, V4L2_IDENT_OV9740 = 260, V4L2_IDENT_OV5642 = 261, + V4L2_IDENT_OV5640 = 262, /* module saa7146: reserved range 300-309 */ V4L2_IDENT_SAA7146 = 300, |