summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2007-05-15 21:36:40 +0200
committerLinus Torvalds2007-05-16 03:56:37 +0200
commit1b2bad2f049e405530b4a8a478edc45770b219c1 (patch)
tree5ea5105c5fa811739511d1106f7e25bf73e2cbdd
parentmissing includes in mlx4 (diff)
downloadkernel-qcow2-linux-1b2bad2f049e405530b4a8a478edc45770b219c1.tar.gz
kernel-qcow2-linux-1b2bad2f049e405530b4a8a478edc45770b219c1.tar.xz
kernel-qcow2-linux-1b2bad2f049e405530b4a8a478edc45770b219c1.zip
em28xx and ivtv should depend on PCI
.. because video-buf.c requires PCI, and VIDEO_EM28XX selects it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/media/video/em28xx/Kconfig2
-rw-r--r--drivers/media/video/ivtv/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 3823b62da4a4..2c450bd05af5 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,6 +1,6 @@
config VIDEO_EM28XX
tristate "Empia EM2800/2820/2840 USB video capture support"
- depends on VIDEO_V4L1 && I2C
+ depends on VIDEO_V4L1 && I2C && PCI
select VIDEO_BUF
select VIDEO_TUNER
select VIDEO_TVEEPROM
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index e854f3f1b70f..0cc98a0e2496 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -1,6 +1,6 @@
config VIDEO_IVTV
tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
- depends on VIDEO_V4L1 && VIDEO_V4L2 && USB && I2C && EXPERIMENTAL
+ depends on VIDEO_V4L1 && VIDEO_V4L2 && USB && I2C && EXPERIMENTAL && PCI
select FW_LOADER
select VIDEO_TUNER
select VIDEO_TVEEPROM