From akpm@osdl.org Sat Jan 27 09:55:37 2007
Date: Sat, 27 Jan 2007 00:54:33 -0800
From: akpm@osdl.org
To: mm-commits@vger.kernel.org
Cc: akpm@osdl.org, geert@linux-m68k.org, mchehab@infradead.org, zippel@linux-m68k.org
Subject: + dvb-video_buf-depends-on-pci.patch added to -mm tree


The patch titled
     dvb: VIDEO_BUF depends on PCI
has been added to the -mm tree.  Its filename is
     dvb-video_buf-depends-on-pci.patch

---
 drivers/media/Kconfig       |    1 +
 drivers/media/video/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- linux-m68k-2.6.21-rcXX.orig/drivers/media/Kconfig
+++ linux-m68k-2.6.21-rcXX/drivers/media/Kconfig
@@ -70,6 +70,7 @@ config VIDEO_TUNER
 	depends on I2C
 
 config VIDEO_BUF
+	depends on PCI
 	tristate
 
 config VIDEO_BUF_DVB
--- linux-m68k-2.6.21-rcXX.orig/drivers/media/video/Kconfig
+++ linux-m68k-2.6.21-rcXX/drivers/media/video/Kconfig
@@ -342,7 +342,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
 	tristate "Virtual Video Driver"
-	depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
+	depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI
 	select VIDEO_BUF
 	default n
 	---help---