Skip to content

Commit d7b5f75

Browse files
arndbHans Verkuil
authored andcommitted
media: ipu-bridge: fix ipu6 Kconfig dependencies
Commit 4670c8c ("media: ipu-bridge: Fix Kconfig dependencies") changed how IPU_BRIDGE dependencies are handled for all drivers, but the IPU6 variant was added the old way, which causes build time warnings when I2C is turned off: WARNING: unmet direct dependencies detected for IPU_BRIDGE Depends on [n]: MEDIA_SUPPORT [=m] && PCI [=y] && MEDIA_PCI_SUPPORT [=y] && (ACPI [=y] || COMPILE_TEST [=y]) && I2C [=n] Selected by [m]: - VIDEO_INTEL_IPU6 [=m] && MEDIA_SUPPORT [=m] && PCI [=y] && MEDIA_PCI_SUPPORT [=y] && (ACPI [=y] || COMPILE_TEST [=y]) && VIDEO_DEV [=m] && X86 [=y] && X86_64 [=y] && HAS_DMA [=y] To make it consistent with the other IPU drivers as well as avoid this warning, change the 'select' into 'depends on'. Fixes: c70281c ("media: intel/ipu6: add Kconfig and Makefile") Signed-off-by: Arnd Bergmann <arnd@arndb.de> [Sakari Ailus: Alternatively depend on !IPU_BRIDGE.] Cc: stable@vger.kernel.org # for v6.10 Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
1 parent 8400291 commit d7b5f75

File tree

1 file changed

+1
-1
lines changed
  • drivers/media/pci/intel/ipu6

1 file changed

+1
-1
lines changed

drivers/media/pci/intel/ipu6/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ config VIDEO_INTEL_IPU6
33
depends on ACPI || COMPILE_TEST
44
depends on VIDEO_DEV
55
depends on X86 && X86_64 && HAS_DMA
6+
depends on IPU_BRIDGE || !IPU_BRIDGE
67
select DMA_OPS
78
select IOMMU_IOVA
89
select VIDEO_V4L2_SUBDEV_API
910
select MEDIA_CONTROLLER
1011
select VIDEOBUF2_DMA_CONTIG
1112
select V4L2_FWNODE
12-
select IPU_BRIDGE
1313
help
1414
This is the 6th Gen Intel Image Processing Unit, found in Intel SoCs
1515
and used for capturing images and video from camera sensors.

0 commit comments

Comments
 (0)