diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-08-19 23:38:04 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-08-19 23:38:04 -0400 |
| commit | 51c8b4071d84d46cc100baa5931ad06b2a823c95 (patch) | |
| tree | 098cf9d41ce1c548d922708a770a9efe35e434df /drivers/media/video/mt9v011.h | |
| parent | a987fcaa805fcb24ba885c2e29fd4fdb6816f08f (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
Merge Linus master to drm-next
linux-next conflict reported needed resolution.
Conflicts:
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/ttm/ttm_bo.c
Diffstat (limited to 'drivers/media/video/mt9v011.h')
| -rw-r--r-- | drivers/media/video/mt9v011.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/mt9v011.h b/drivers/media/video/mt9v011.h index 9e443ee30558..3350fd6083c3 100644 --- a/drivers/media/video/mt9v011.h +++ b/drivers/media/video/mt9v011.h | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #define R35_MT9V011_GLOBAL_GAIN 0x35 | 30 | #define R35_MT9V011_GLOBAL_GAIN 0x35 |
| 31 | #define RF1_MT9V011_CHIP_ENABLE 0xf1 | 31 | #define RF1_MT9V011_CHIP_ENABLE 0xf1 |
| 32 | 32 | ||
| 33 | #define MT9V011_VERSION 0x8243 | 33 | #define MT9V011_VERSION 0x8232 |
| 34 | #define MT9V011_REV_B_VERSION 0x8243 | ||
| 34 | 35 | ||
| 35 | #endif | 36 | #endif |