summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-26 10:45:28 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-06-08 08:21:12 -0300
commit05f85839a2ffcaa75d505526ca8e74097be18d8c (patch)
tree183cf94e950c8847dc3b6f373d5265c0b0865c30 /drivers/media
parent85f6038f2170e3335dda09c3dfb0f83110e87019 (diff)
downloadlinux-3.10-05f85839a2ffcaa75d505526ca8e74097be18d8c.tar.gz
linux-3.10-05f85839a2ffcaa75d505526ca8e74097be18d8c.tar.bz2
linux-3.10-05f85839a2ffcaa75d505526ca8e74097be18d8c.zip
V4L/DVB (5702): Fix Kconfig items to avoid linkedition errors
The recent changes on Kconfig broke compilation when VIDEO_DEV is compiled as module. On some cases, drivers like VIDEO_BUF are compiled with 'y' option instead of 'm': ... Thanks to: Toralf Forster <toralf.foerster@gmx.de> for pointing this issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/Kconfig1
-rw-r--r--drivers/media/video/Kconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index c120114c241..5c63c8e24ee 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -4,5 +4,6 @@ config VIDEO_SAA7146
config VIDEO_SAA7146_VV
tristate
+ depends on VIDEO_DEV
select VIDEO_BUF
select VIDEO_SAA7146
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 5cb3f54b548..4cca55170e2 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -347,7 +347,7 @@ endmenu # encoder / decoder chips
config VIDEO_VIVI
tristate "Virtual Video Driver"
- depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI
+ depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI && VIDEO_DEV
select VIDEO_BUF
default n
---help---