diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-14 13:43:08 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-14 13:43:08 +0200 |
| commit | fc342c6b0b0f468a3864d3c8902ed8e31762e866 (patch) | |
| tree | b061713ed8052960768b07667e52c0be6e16e674 /drivers/media | |
| parent | 1bf07d164fcf5553d98a737b0e0caad208ab51e4 (diff) | |
| parent | 3711d86a2de17e967b576af8b8a1e9351a7d1466 (diff) | |
| download | kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.tar.gz kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.tar.bz2 kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.zip | |
Merge remote-tracking branch 'linus/master' into 3.12-wip
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/radio/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 8068d7b6415..c7caf94621b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -203,7 +203,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC config VIDEO_SH_VEU tristate "SuperH VEU mem2mem video processing driver" - depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS && HAS_DMA + depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV help diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 39882ddd259..6ecdc39bb36 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -214,7 +214,7 @@ config RADIO_TIMBERDALE config RADIO_WL1273 tristate "Texas Instruments WL1273 I2C FM Radio" - depends on I2C && VIDEO_V4L2 && GENERIC_HARDIRQS + depends on I2C && VIDEO_V4L2 select MFD_CORE select MFD_WL1273_CORE select FW_LOADER |