diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-15 17:27:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-15 17:27:12 +0100 |
| commit | cd2d95d97c8d1b66467507400c63d707ddb1deba (patch) | |
| tree | 7ad5223ba88110ca6735637c9eef327515e9bb96 /drivers/media/platform/Kconfig | |
| parent | 88dd75af0e49e1dabef6f7c7f7f4fa0234b9b988 (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| download | linux-cd2d95d97c8d1b66467507400c63d707ddb1deba.tar.bz2 | |
Merge tag 'v3.9-rc7' into regulator-fix-core
Linux 3.9-rc7
Trivial context overlap conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/media/platform/Kconfig')
| -rw-r--r-- | drivers/media/platform/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 05d7b6333461..a0639e779973 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -204,7 +204,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC config VIDEO_SH_VEU tristate "SuperH VEU mem2mem video processing driver" - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV help |