diff options
| -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 0cc98a0e2496..1aaeaa02f158 100644 --- a/drivers/media/video/ivtv/Kconfig +++ b/drivers/media/video/ivtv/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config VIDEO_IVTV | 1 | config VIDEO_IVTV |
| 2 | tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support" | 2 | tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support" |
| 3 | depends on VIDEO_V4L1 && VIDEO_V4L2 && USB && I2C && EXPERIMENTAL && PCI | 3 | depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL |
| 4 | select FW_LOADER | 4 | select FW_LOADER |
| 5 | select VIDEO_TUNER | 5 | select VIDEO_TUNER |
| 6 | select VIDEO_TVEEPROM | 6 | select VIDEO_TVEEPROM |
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 9a412d6c6d06..552f04511ead 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
| @@ -67,14 +67,6 @@ | |||
| 67 | 67 | ||
| 68 | #include <media/ivtv.h> | 68 | #include <media/ivtv.h> |
| 69 | 69 | ||
| 70 | #ifdef CONFIG_LIRC_I2C | ||
| 71 | # error "This driver is not compatible with the LIRC I2C kernel configuration option." | ||
| 72 | #endif /* CONFIG_LIRC_I2C */ | ||
| 73 | |||
| 74 | #ifndef CONFIG_PCI | ||
| 75 | # error "This driver requires kernel PCI support." | ||
| 76 | #endif /* CONFIG_PCI */ | ||
| 77 | |||
| 78 | #define IVTV_ENCODER_OFFSET 0x00000000 | 70 | #define IVTV_ENCODER_OFFSET 0x00000000 |
| 79 | #define IVTV_ENCODER_SIZE 0x00800000 /* Last half isn't needed 0x01000000 */ | 71 | #define IVTV_ENCODER_SIZE 0x00800000 /* Last half isn't needed 0x01000000 */ |
| 80 | 72 | ||
