Re: [GIT PATCHES for 2.6.28] V4L/DVB fixes

[Ingo Molnar <mingo@elte.hu>]

* Mauro Carvalho Chehab <mchehab@redhat.com> wrote:

> On Thu, 25 Dec 2008 09:19:07 +0100
> Ingo Molnar <mingo@elte.hu> wrote:
> 
> > FYI, v2.6.28 still fails to build with certain configs:
> > 
> >  drivers/media/dvb/built-in.o: In function `dib7000p_set_gpio':
> >  (.text+0x3f242): multiple definition of `dib7000p_set_gpio'
> >  drivers/media/video/built-in.o:(.text+0xb8c1e): first defined here
> >  drivers/media/dvb/built-in.o: In function `dib7000p_i2c_enumeration':
> >  (.text+0x3f282): multiple definition of `dib7000p_i2c_enumeration'
> >  drivers/media/video/built-in.o:(.text+0xb8c3e): first defined here
> >  drivers/media/dvb/built-in.o: In function `dib7000p_set_wbd_ref':
> >  (.text+0x3f1c1): multiple definition of `dib7000p_set_wbd_ref'
> >  drivers/media/video/built-in.o:(.text+0xb8bfe): first defined here
> >    LD      drivers/net/built-in.o
> >  make[2]: *** [drivers/media/built-in.o] Error 1
> > 
> > Config attached. The patch below works it around in tip/master. Can test 
> > any patch for this bug.
> 
> Please test the enclosed patch.

thanks Mauro - i've reverted all my local drivers/media/dvb/ hacks (see 
them below) and applied your fix, and started testing things. Will let you 
know if i run into any other kind of build or boot trouble.

	Ingo

--------------->

diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig
index 1332301..d5fc581 100644
--- a/drivers/media/dvb/dm1105/Kconfig
+++ b/drivers/media/dvb/dm1105/Kconfig
@@ -7,6 +7,8 @@ config DVB_DM1105
 	select DVB_STB6000 if !DVB_FE_CUSTOMISE
 	select DVB_CX24116 if !DVB_FE_CUSTOMISE
 	select DVB_SI21XX if !DVB_FE_CUSTOMISE
+	# build failure
+	depends on 0
 	help
 	  Support for cards based on the SDMC DM1105 PCI chip like
 	  DvbWorld 2002
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 49f7b20..448d42b 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -1,6 +1,7 @@
 config DVB_USB
 	tristate "Support for various USB DVB devices"
 	depends on DVB_CORE && USB && I2C && INPUT
+	depends on BROKEN
 	help
 	  By enabling this you will be able to choose the various supported
 	  USB1.1 and USB2.0 DVB devices.
@@ -235,6 +236,7 @@ config DVB_USB_OPERA1
 config DVB_USB_AF9005
 	tristate "Afatech AF9005 DVB-T USB1.1 support"
 	depends on DVB_USB && EXPERIMENTAL
+	depends on BROKEN
 	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
 	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
 	help