diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-21 07:10:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 16:00:12 -0300 |
| commit | d460f857a5332fe892d88ddfb5efa827dc3b25e6 (patch) | |
| tree | b8a4afdfb9f62535c1915303dbf1c96cae8ebeb4 /drivers/media | |
| parent | d25790532370e7448e3d3bd25a17e1e9f1299816 (diff) | |
| download | op-kernel-dev-d460f857a5332fe892d88ddfb5efa827dc3b25e6.zip op-kernel-dev-d460f857a5332fe892d88ddfb5efa827dc3b25e6.tar.gz | |
V4L/DVB (5639): Fix Kconfig dependencies for ivtv
ivtv were wrongly marked as dependent of USB.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/ivtv/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig index 0cc98a0..1aaeaa0 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 && PCI + depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL select FW_LOADER select VIDEO_TUNER select VIDEO_TVEEPROM diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 9a412d6..552f045 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h @@ -67,14 +67,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 */ |
