2007-05-15 19:37:21

by Al Viro

Subject: [PATCH] em28xx and ivtv should depend on PCI

Signed-off-by: Al Viro <[email protected]>
---
drivers/media/video/em28xx/Kconfig | 2 +-
drivers/media/video/ivtv/Kconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 3823b62..2c450bd 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 e854f3f..0cc98a0 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
--
1.5.0-rc2.GIT

2007-05-15 19:49:49

by Alexey Dobriyan

Subject: Re: [PATCH] em28xx and ivtv should depend on PCI

On Tue, May 15, 2007 at 08:36:40PM +0100, Al Viro wrote:
> --- 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

Don't forget to remove #error:

Signed-off-by: Alexey Dobriyan <[email protected]>

--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -71,10 +71,6 @@ #ifdef CONFIG_LIRC_I2C
# error "This driver is not compatible with the LIRC I2C kernel configuration option."
#endif /* CONFIG_LIRC_I2C */

-#ifndef CONFIG_PCI
-# error "This driver requires kernel PCI support."
-#endif /* CONFIG_PCI */
-
#define IVTV_ENCODER_OFFSET 0x00000000
#define IVTV_ENCODER_SIZE 0x00800000 /* Last half isn't needed 0x01000000 */

2007-05-15 23:25:45

by Manu Abraham

Subject: Re: [PATCH] em28xx and ivtv should depend on PCI

Al Viro wrote:
> Signed-off-by: Al Viro <[email protected]>
> ---
> drivers/media/video/em28xx/Kconfig | 2 +-
> drivers/media/video/ivtv/Kconfig | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
> index 3823b62..2c450bd 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

Err .. why would a USB device need to be depend on PCI ?

2007-05-16 01:23:12

by Al Viro

Subject: Re: [PATCH] em28xx and ivtv should depend on PCI

On Wed, May 16, 2007 at 03:25:23AM +0400, Manu Abraham wrote:
> Al Viro wrote:
> > Signed-off-by: Al Viro <[email protected]>
> > ---
> > drivers/media/video/em28xx/Kconfig | 2 +-
> > drivers/media/video/ivtv/Kconfig | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
> > index 3823b62..2c450bd 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
>
> Err .. why would a USB device need to be depend on PCI ?

Because video-buf.c does. And VIDEO_EM28XX selects it.

2007-05-16 03:57:49

by Markus Rechberger

Subject: Re: [PATCH] em28xx and ivtv should depend on PCI

On 5/16/07, Al Viro <[email protected]> wrote:
> On Wed, May 16, 2007 at 03:25:23AM +0400, Manu Abraham wrote:
> > Al Viro wrote:
> > > Signed-off-by: Al Viro <[email protected]>
> > > ---
> > > drivers/media/video/em28xx/Kconfig | 2 +-
> > > drivers/media/video/ivtv/Kconfig | 2 +-
> > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/media/video/em28xx/Kconfig
> b/drivers/media/video/em28xx/Kconfig
> > > index 3823b62..2c450bd 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
> >
> > Err .. why would a USB device need to be depend on PCI ?
>
> Because video-buf.c does. And VIDEO_EM28XX selects it.

the em28xx does not rely on video-buf, this seems to be a dependency
derived from another dependency.

Markus

2007-05-16 05:03:22

by Al Viro

Subject: Re: [PATCH] em28xx and ivtv should depend on PCI

On Wed, May 16, 2007 at 05:57:39AM +0200, Markus Rechberger wrote:
> On 5/16/07, Al Viro <[email protected]> wrote:
> >On Wed, May 16, 2007 at 03:25:23AM +0400, Manu Abraham wrote:
> >> Al Viro wrote:
> >> > Signed-off-by: Al Viro <[email protected]>
> >> > ---
> >> > drivers/media/video/em28xx/Kconfig | 2 +-
> >> > drivers/media/video/ivtv/Kconfig | 2 +-
> >> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >> >
> >> > diff --git a/drivers/media/video/em28xx/Kconfig
> >b/drivers/media/video/em28xx/Kconfig
> >> > index 3823b62..2c450bd 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
> >>
> >> Err .. why would a USB device need to be depend on PCI ?
> >
> >Because video-buf.c does. And VIDEO_EM28XX selects it.
>
> the em28xx does not rely on video-buf, this seems to be a dependency
> derived from another dependency.

select VIDEO_BUF
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_IR
select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO
---help---
This is a video4linux driver for Empia 28xx based TV cards.

To compile this driver as a module, choose M here: the
module will be called em28xx

The first line does it. It's not a dependency, it's a direct select.
And drivers/media/video/Makefile has
obj-$(CONFIG_VIDEO_BUF) += video-buf.o

2007-05-16 11:03:18

by Mauro Carvalho Chehab

Subject: Re: [PATCH] em28xx and ivtv should depend on PCI

On Wed, 16 May 2007, Al Viro wrote:

>>> + depends on VIDEO_V4L1 && I2C && PCI
>>
>> Err .. why would a USB device need to be depend on PCI ?
>
> Because video-buf.c does. And VIDEO_EM28XX selects it.

There are already two patches fixing the broken dependencies for ivtv and
em28xx on my -git tree:

http://git.kernel.org/?p=linux/kernel/git/mchehab/v4l-dvb.git;a=commitdiff;h=1cf15bd2c8606e232d4c29273f8d05fcd47cc0fd
http://git.kernel.org/?p=linux/kernel/git/mchehab/v4l-dvb.git;a=commitdiff;h=42aadebe90d9bc18a6753be45ed878b07de4c560

I've already asked Linus to pull it:

http://lkml.org/lkml/2007/5/13/100


--
Cheers,
Mauro Carvalho Chehab
http://linuxtv.org
[email protected]