diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/Kconfig | 4 | ||||
-rw-r--r-- | drivers/media/video/cx18/Kconfig | 3 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/Kconfig | 4 | ||||
-rw-r--r-- | drivers/media/video/cx88/Kconfig | 3 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 1 | ||||
-rw-r--r-- | drivers/media/video/em28xx/Kconfig | 4 | ||||
-rw-r--r-- | drivers/media/video/ivtv/Kconfig | 3 | ||||
-rw-r--r-- | drivers/media/video/saa7134/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/tlg2300/Kconfig | 4 |
10 files changed, 13 insertions, 17 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 6830d2848bd7..22feac4d1e8f 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -96,7 +96,7 @@ config VIDEO_HELPER_CHIPS_AUTO | |||
96 | 96 | ||
97 | config VIDEO_IR_I2C | 97 | config VIDEO_IR_I2C |
98 | tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO | 98 | tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO |
99 | depends on I2C && VIDEO_IR | 99 | depends on I2C && IR_CORE |
100 | default y | 100 | default y |
101 | ---help--- | 101 | ---help--- |
102 | Most boards have an IR chip directly connected via GPIO. However, | 102 | Most boards have an IR chip directly connected via GPIO. However, |
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig index 1a4a89fdf767..659e44873440 100644 --- a/drivers/media/video/bt8xx/Kconfig +++ b/drivers/media/video/bt8xx/Kconfig | |||
@@ -1,10 +1,10 @@ | |||
1 | config VIDEO_BT848 | 1 | config VIDEO_BT848 |
2 | tristate "BT848 Video For Linux" | 2 | tristate "BT848 Video For Linux" |
3 | depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT | 3 | depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 |
4 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
5 | select VIDEO_BTCX | 5 | select VIDEO_BTCX |
6 | select VIDEOBUF_DMA_SG | 6 | select VIDEOBUF_DMA_SG |
7 | depends on VIDEO_IR | 7 | depends on IR_LEGACY |
8 | select VIDEO_TUNER | 8 | select VIDEO_TUNER |
9 | select VIDEO_TVEEPROM | 9 | select VIDEO_TVEEPROM |
10 | select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO | 10 | select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO |
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index 76c054d1eef9..f3c3ccb491fe 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig | |||
@@ -1,9 +1,8 @@ | |||
1 | config VIDEO_CX18 | 1 | config VIDEO_CX18 |
2 | tristate "Conexant cx23418 MPEG encoder support" | 2 | tristate "Conexant cx23418 MPEG encoder support" |
3 | depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL | 3 | depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL |
4 | depends on INPUT # due to VIDEO_IR | ||
5 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
6 | depends on VIDEO_IR | 5 | depends on IR_CORE |
7 | select VIDEO_TUNER | 6 | select VIDEO_TUNER |
8 | select VIDEO_TVEEPROM | 7 | select VIDEO_TVEEPROM |
9 | select VIDEO_CX2341X | 8 | select VIDEO_CX2341X |
diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig index c37eac114024..ab7d5df50f55 100644 --- a/drivers/media/video/cx231xx/Kconfig +++ b/drivers/media/video/cx231xx/Kconfig | |||
@@ -1,9 +1,9 @@ | |||
1 | config VIDEO_CX231XX | 1 | config VIDEO_CX231XX |
2 | tristate "Conexant cx231xx USB video capture support" | 2 | tristate "Conexant cx231xx USB video capture support" |
3 | depends on VIDEO_DEV && I2C && INPUT | 3 | depends on VIDEO_DEV && I2C |
4 | select VIDEO_TUNER | 4 | select VIDEO_TUNER |
5 | select VIDEO_TVEEPROM | 5 | select VIDEO_TVEEPROM |
6 | depends on VIDEO_IR | 6 | depends on IR_CORE |
7 | select VIDEOBUF_VMALLOC | 7 | select VIDEOBUF_VMALLOC |
8 | select VIDEO_CX25840 | 8 | select VIDEO_CX25840 |
9 | select VIDEO_CX2341X | 9 | select VIDEO_CX2341X |
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index bcfd1ac48cc6..dbae62935e1f 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig | |||
@@ -1,12 +1,11 @@ | |||
1 | config VIDEO_CX88 | 1 | config VIDEO_CX88 |
2 | tristate "Conexant 2388x (bt878 successor) support" | 2 | tristate "Conexant 2388x (bt878 successor) support" |
3 | depends on VIDEO_DEV && PCI && I2C && INPUT && IR_CORE | 3 | depends on VIDEO_DEV && PCI && I2C && IR_CORE |
4 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
5 | select VIDEO_BTCX | 5 | select VIDEO_BTCX |
6 | select VIDEOBUF_DMA_SG | 6 | select VIDEOBUF_DMA_SG |
7 | select VIDEO_TUNER | 7 | select VIDEO_TUNER |
8 | select VIDEO_TVEEPROM | 8 | select VIDEO_TVEEPROM |
9 | depends on VIDEO_IR | ||
10 | select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO | 9 | select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO |
11 | ---help--- | 10 | ---help--- |
12 | This is a video4linux driver for Conexant 2388x based | 11 | This is a video4linux driver for Conexant 2388x based |
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 564e3cb29c4d..8c41124befbd 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -31,7 +31,6 @@ | |||
31 | 31 | ||
32 | #include "cx88.h" | 32 | #include "cx88.h" |
33 | #include <media/ir-core.h> | 33 | #include <media/ir-core.h> |
34 | #include <media/ir-common.h> | ||
35 | 34 | ||
36 | #define MODULE_NAME "cx88xx" | 35 | #define MODULE_NAME "cx88xx" |
37 | 36 | ||
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig index 8d38c5fdece0..72ea2baba790 100644 --- a/drivers/media/video/em28xx/Kconfig +++ b/drivers/media/video/em28xx/Kconfig | |||
@@ -1,9 +1,9 @@ | |||
1 | config VIDEO_EM28XX | 1 | config VIDEO_EM28XX |
2 | tristate "Empia EM28xx USB video capture support" | 2 | tristate "Empia EM28xx USB video capture support" |
3 | depends on VIDEO_DEV && I2C && INPUT | 3 | depends on VIDEO_DEV && I2C |
4 | select VIDEO_TUNER | 4 | select VIDEO_TUNER |
5 | select VIDEO_TVEEPROM | 5 | select VIDEO_TVEEPROM |
6 | depends on VIDEO_IR | 6 | depends on IR_CORE |
7 | select VIDEOBUF_VMALLOC | 7 | select VIDEOBUF_VMALLOC |
8 | select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO | 8 | select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO |
9 | select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO | 9 | select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO |
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig index be4af1fa557e..c4f19801c73b 100644 --- a/drivers/media/video/ivtv/Kconfig +++ b/drivers/media/video/ivtv/Kconfig | |||
@@ -1,9 +1,8 @@ | |||
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_V4L2 && PCI && I2C | 3 | depends on VIDEO_V4L2 && PCI && I2C |
4 | depends on INPUT # due to VIDEO_IR | ||
5 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
6 | depends on VIDEO_IR | 5 | depends on IR_CORE |
7 | select VIDEO_TUNER | 6 | select VIDEO_TUNER |
8 | select VIDEO_TVEEPROM | 7 | select VIDEO_TVEEPROM |
9 | select VIDEO_CX2341X | 8 | select VIDEO_CX2341X |
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index 3fe71be41a1f..32a95a2d66a1 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig | |||
@@ -26,7 +26,7 @@ config VIDEO_SAA7134_ALSA | |||
26 | 26 | ||
27 | config VIDEO_SAA7134_RC | 27 | config VIDEO_SAA7134_RC |
28 | bool "Philips SAA7134 Remote Controller support" | 28 | bool "Philips SAA7134 Remote Controller support" |
29 | depends on VIDEO_IR | 29 | depends on IR_LEGACY |
30 | depends on VIDEO_SAA7134 | 30 | depends on VIDEO_SAA7134 |
31 | default y | 31 | default y |
32 | ---help--- | 32 | ---help--- |
diff --git a/drivers/media/video/tlg2300/Kconfig b/drivers/media/video/tlg2300/Kconfig index 1686ebfa6951..580580ec9362 100644 --- a/drivers/media/video/tlg2300/Kconfig +++ b/drivers/media/video/tlg2300/Kconfig | |||
@@ -1,9 +1,9 @@ | |||
1 | config VIDEO_TLG2300 | 1 | config VIDEO_TLG2300 |
2 | tristate "Telegent TLG2300 USB video capture support" | 2 | tristate "Telegent TLG2300 USB video capture support" |
3 | depends on VIDEO_DEV && I2C && INPUT && SND && DVB_CORE | 3 | depends on VIDEO_DEV && I2C && SND && DVB_CORE |
4 | select VIDEO_TUNER | 4 | select VIDEO_TUNER |
5 | select VIDEO_TVEEPROM | 5 | select VIDEO_TVEEPROM |
6 | depends on VIDEO_IR | 6 | depends on IR_CORE |
7 | select VIDEOBUF_VMALLOC | 7 | select VIDEOBUF_VMALLOC |
8 | select SND_PCM | 8 | select SND_PCM |
9 | select VIDEOBUF_DVB | 9 | select VIDEOBUF_DVB |