em28xx and ivtv should depend on PCI
PATCH 1/1 em28xx and ivtv should depend on PCI
--- drivers/media/video/em28xx/Kconfig | 2 +- drivers/media/video/ivtv/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/video/em28xx/Kconfig +1 -1
@@ -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
drivers/media/video/ivtv/Kconfig +1 -1
@@ -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
Signature · 1 line
1.5.0-rc2.GIT
drivers/media/video/ivtv/Kconfig line 6
Quoted 10 lines · Al Viro
drivers/media/video/ivtv/Kconfig +1
-1@@ -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:
drivers/media/video/ivtv/ivtv-driver.h +0 -4
@@ -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 */
Quoted 11 lines · Al Viro
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(-)drivers/media/video/em28xx/Kconfig +0
-0
drivers/media/video/em28xx/Kconfig line 3
Quoted 4 lines
drivers/media/video/em28xx/Kconfig +1
-1@@ -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 ?
Quoted 7 lines · Manu Abraham
Quoted 6 lines · Al Viro
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(-)
Quoted 11 lines
drivers/media/video/em28xx/Kconfig line 3
Quoted 9 lines
drivers/media/video/em28xx/Kconfig +1
-1@@ -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 && PCIErr .. why would a USB device need to be depend on PCI ?
Because video-buf.c does. And VIDEO_EM28XX selects it.
Quoted 21 lines · Al Viro
Quoted 8 lines · Manu Abraham
Review
Quoted 7 lines · Al Viro
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(-)(quoted diff) +0
-0b/drivers/media/video/em28xx/Kconfig
Quoted 10 lines
drivers/media/video/em28xx/Kconfig line 3
Quoted 8 lines
index 3823b62..2c450bd 100644
drivers/media/video/em28xx/Kconfig +1
-1@@ -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 && PCIErr .. why would a USB device need to be depend on PCI ?
Quoted 1 line
Because
video-buf.cdoes. AndVIDEO_EM28XXselects it.
the em28xx does not rely on video-buf, this seems to be a dependency derived from another dependency.
Markus
Quoted 22 lines · Markus Rechberger
Quoted 21 lines · Al Viro
Quoted 8 lines · Manu Abraham
Review
Quoted 7 lines · Al Viro
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(-)(quoted diff) +0
-0b/drivers/media/video/em28xx/Kconfig
Quoted 10 lines
drivers/media/video/em28xx/Kconfig line 3
Quoted 8 lines
index 3823b62..2c450bd 100644
drivers/media/video/em28xx/Kconfig +1
-1@@ -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 && PCIErr .. why would a USB device need to be depend on PCI ?
Quoted 4 lines
Quoted 1 line
Because
video-buf.cdoes. AndVIDEO_EM28XXselects 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
Quoted 5 lines · Al Viro
Quoted 3 lines
drivers/media/video/em28xx/Kconfig line 3
Quoted 1 line
drivers/media/video/em28xx/Kconfig +1
-0+ depends on VIDEO_V4L1 && I2C && PCIErr .. why would a USB device need to be depend on PCI ?
Because
video-buf.cdoes. AndVIDEO_EM28XXselects 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
Signature · 4 lines
Cheers, Mauro Carvalho Chehab http://linuxtv.org [email protected]