diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-09 08:02:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-09 08:02:02 -0300 |
| commit | 8af0d166232a993daeb59e11ce728744b781bbea (patch) | |
| tree | d95b22f54226c2abd887d3b94932029c6b7ec9b1 | |
| parent | 9ca6b3d98b22e2f27cc097f2bf15c999dff237e0 (diff) | |
| parent | 26df07d4db0ad3fa6db8b19e3703081bd1458f3f (diff) | |
| download | mediapointer-dvb-s2-8af0d166232a993daeb59e11ce728744b781bbea.tar.gz mediapointer-dvb-s2-8af0d166232a993daeb59e11ce728744b781bbea.tar.bz2 | |
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/em28xx/Kconfig | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 8 |
3 files changed, 1 insertions, 10 deletions
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 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 */ |