diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-22 15:42:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-04 15:09:22 -0400 |
commit | 2abfeef620171db94ef59b85f7a81561019eda20 (patch) | |
tree | 35d325622722debfb5841762473d64e6250e78ee /drivers/media/platform/davinci | |
parent | 85594960f54aebcf2bd3ef4d57d77fa1bfc7e1e2 (diff) |
[media] dm644x_ccdc: remove check for CONFIG_DM644X_VIDEO_PORT_ENABLE
A check for CONFIG_DM644X_VIDEO_PORT_ENABLE was added in v2.6.32. The
related Kconfig symbol was never added so this check has always
evaluated to false. Remove that check.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/davinci')
-rw-r--r-- | drivers/media/platform/davinci/dm644x_ccdc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c index 30fa08405d61..07e98df3d867 100644 --- a/drivers/media/platform/davinci/dm644x_ccdc.c +++ b/drivers/media/platform/davinci/dm644x_ccdc.c | |||
@@ -581,13 +581,8 @@ void ccdc_config_raw(void) | |||
581 | config_params->alaw.enable) | 581 | config_params->alaw.enable) |
582 | syn_mode |= CCDC_DATA_PACK_ENABLE; | 582 | syn_mode |= CCDC_DATA_PACK_ENABLE; |
583 | 583 | ||
584 | #ifdef CONFIG_DM644X_VIDEO_PORT_ENABLE | ||
585 | /* enable video port */ | ||
586 | val = CCDC_ENABLE_VIDEO_PORT; | ||
587 | #else | ||
588 | /* disable video port */ | 584 | /* disable video port */ |
589 | val = CCDC_DISABLE_VIDEO_PORT; | 585 | val = CCDC_DISABLE_VIDEO_PORT; |
590 | #endif | ||
591 | 586 | ||
592 | if (config_params->data_sz == CCDC_DATA_8BITS) | 587 | if (config_params->data_sz == CCDC_DATA_8BITS) |
593 | val |= (CCDC_DATA_10BITS & CCDC_FMTCFG_VPIN_MASK) | 588 | val |= (CCDC_DATA_10BITS & CCDC_FMTCFG_VPIN_MASK) |