diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-09 07:00:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-09 07:00:00 -0300 |
| commit | 34349f6638398a9979253461fa9b2d9204accac8 (patch) | |
| tree | 1e3d977d04d778f9da7dd789cdc58a16842af1e3 /linux/drivers/media/video | |
| parent | 4f1a121a633c3de1bd905b3becd57955b5e2b608 (diff) | |
| download | mediapointer-dvb-s2-34349f6638398a9979253461fa9b2d9204accac8.tar.gz mediapointer-dvb-s2-34349f6638398a9979253461fa9b2d9204accac8.tar.bz2 | |
Fix Kconfig dependencies for ivtv
From: Mauro Carvalho Chehab <mchehab@infradead.org>
As pointed by Geert Uytterhoeven <geert@linux-m68k.org>, 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 <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/ivtv/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 8 |
2 files changed, 1 insertions, 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 <media/ivtv.h> -#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 */ |