From 34349f6638398a9979253461fa9b2d9204accac8 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 9 May 2007 07:00:00 -0300 Subject: Fix Kconfig dependencies for ivtv From: Mauro Carvalho Chehab As pointed by Geert Uytterhoeven , ivtv-driver.h have two checks for CONFIG vars, inerited from the time it were an out of kernel driver. Also, ivtv were wrongly marked as dependent of USB. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/ivtv/Kconfig | 2 +- linux/drivers/media/video/ivtv/ivtv-driver.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/linux/drivers/media/video/ivtv/Kconfig b/linux/drivers/media/video/ivtv/Kconfig index e854f3f1b..1aaeaa02f 100644 --- a/linux/drivers/media/video/ivtv/Kconfig +++ b/linux/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 && PCI && I2C && EXPERIMENTAL select FW_LOADER select VIDEO_TUNER select VIDEO_TVEEPROM diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h index 39e1d7e46..604448dd1 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.h +++ b/linux/drivers/media/video/ivtv/ivtv-driver.h @@ -70,14 +70,6 @@ #include -#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 */ -- cgit v1.2.3 From 26df07d4db0ad3fa6db8b19e3703081bd1458f3f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 9 May 2007 07:06:23 -0300 Subject: Fix: em28xx currently doesn't require VIDEO_BUF From: Mauro Carvalho Chehab Fix a bad dependency, as pointed by Geert Uytterhoeven : | drivers/media/video/video-buf.c: In function 'videobuf_queue_pci': | drivers/media/video/video-buf.c:399: error: 'pci_map_sg' undeclared (first use in this function) Probably some new driver does a select VIDEO_BUF, which overrides that VIDEO_BUF depends on PCI? Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/em28xx/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/linux/drivers/media/video/em28xx/Kconfig b/linux/drivers/media/video/em28xx/Kconfig index 3823b62da..5b6a40371 100644 --- a/linux/drivers/media/video/em28xx/Kconfig +++ b/linux/drivers/media/video/em28xx/Kconfig @@ -1,7 +1,6 @@ config VIDEO_EM28XX tristate "Empia EM2800/2820/2840 USB video capture support" depends on VIDEO_V4L1 && I2C - select VIDEO_BUF select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_IR -- cgit v1.2.3