diff --git a/[refs] b/[refs] index 71ebbccd9c2e..b196daf5e40b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 250539a36f69aa51e4c68a1f92c4ed2bcc042a1a +refs/heads/master: e669c8d379567d42d62989f890f926f7b1b8f2a1 diff --git a/trunk/drivers/media/platform/blackfin/Kconfig b/trunk/drivers/media/platform/blackfin/Kconfig index 519990e17122..cc239972fa2c 100644 --- a/trunk/drivers/media/platform/blackfin/Kconfig +++ b/trunk/drivers/media/platform/blackfin/Kconfig @@ -2,7 +2,6 @@ config VIDEO_BLACKFIN_CAPTURE tristate "Blackfin Video Capture Driver" depends on VIDEO_V4L2 && BLACKFIN && I2C select VIDEOBUF2_DMA_CONTIG - select VIDEO_BLACKFIN_PPI help V4L2 bridge driver for Blackfin video capture device. Choose PPI or EPPI as its interface. @@ -12,3 +11,5 @@ config VIDEO_BLACKFIN_CAPTURE config VIDEO_BLACKFIN_PPI tristate + depends on VIDEO_BLACKFIN_CAPTURE + default VIDEO_BLACKFIN_CAPTURE