Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: V4L/DVB: v4l2-ctrls.c: needs to include slab.h V4L/DVB: fix Kconfig to depends on VIDEO_IR V4L/DVB: Fix IR_CORE dependencies
This commit is contained in:
Linus Torvalds
Коммит
1547ac893a
|
|
@ -2,14 +2,21 @@ menuconfig IR_CORE
|
|||
tristate "Infrared remote controller adapters"
|
||||
depends on INPUT
|
||||
default INPUT
|
||||
---help---
|
||||
Enable support for Remote Controllers on Linux. This is
|
||||
needed in order to support several video capture adapters.
|
||||
|
||||
if IR_CORE
|
||||
Enable this option if you have a video capture board even
|
||||
if you don't need IR, as otherwise, you may not be able to
|
||||
compile the driver for your adapter.
|
||||
|
||||
config VIDEO_IR
|
||||
tristate
|
||||
depends on IR_CORE
|
||||
default IR_CORE
|
||||
|
||||
if IR_CORE
|
||||
|
||||
config LIRC
|
||||
tristate
|
||||
default y
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ config DVB_DM1105
|
|||
select DVB_CX24116 if !DVB_FE_CUSTOMISE
|
||||
select DVB_SI21XX if !DVB_FE_CUSTOMISE
|
||||
select DVB_DS3000 if !DVB_FE_CUSTOMISE
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
help
|
||||
Support for cards based on the SDMC DM1105 PCI chip like
|
||||
DvbWorld 2002
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
config DVB_USB
|
||||
tristate "Support for various USB DVB devices"
|
||||
depends on DVB_CORE && USB && I2C && INPUT
|
||||
depends on DVB_CORE && USB && I2C && IR_CORE
|
||||
help
|
||||
By enabling this you will be able to choose the various supported
|
||||
USB1.1 and USB2.0 DVB devices.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
config SMS_SIANO_MDTV
|
||||
tristate "Siano SMS1xxx based MDTV receiver"
|
||||
depends on DVB_CORE && INPUT && HAS_DMA
|
||||
depends on DVB_CORE && IR_CORE && HAS_DMA
|
||||
---help---
|
||||
Choose Y or M here if you have MDTV receiver with a Siano chipset.
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ config DVB_BUDGET_CI
|
|||
select DVB_LNBP21 if !DVB_FE_CUSTOMISE
|
||||
select DVB_TDA10023 if !DVB_FE_CUSTOMISE
|
||||
select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
help
|
||||
Support for simple SAA7146 based DVB cards
|
||||
(so called Budget- or Nova-PCI cards) without onboard
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ config VIDEO_BT848
|
|||
select I2C_ALGOBIT
|
||||
select VIDEO_BTCX
|
||||
select VIDEOBUF_DMA_SG
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ config VIDEO_CX18
|
|||
depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
|
||||
depends on INPUT # due to VIDEO_IR
|
||||
select I2C_ALGOBIT
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_CX2341X
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ config VIDEO_CX231XX
|
|||
depends on VIDEO_DEV && I2C && INPUT
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEOBUF_VMALLOC
|
||||
select VIDEO_CX25840
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ config VIDEO_CX23885
|
|||
select VIDEO_BTCX
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select IR_CORE
|
||||
depends on IR_CORE
|
||||
select VIDEOBUF_DVB
|
||||
select VIDEOBUF_DMA_SG
|
||||
select VIDEO_CX25840
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ config VIDEO_CX88
|
|||
select VIDEOBUF_DMA_SG
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
|
||||
---help---
|
||||
This is a video4linux driver for Conexant 2388x based
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ config VIDEO_EM28XX
|
|||
depends on VIDEO_DEV && I2C && INPUT
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEOBUF_VMALLOC
|
||||
select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
|
||||
select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ config VIDEO_IVTV
|
|||
depends on VIDEO_V4L2 && PCI && I2C
|
||||
depends on INPUT # due to VIDEO_IR
|
||||
select I2C_ALGOBIT
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_CX2341X
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ config VIDEO_SAA7134
|
|||
tristate "Philips SAA7134 support"
|
||||
depends on VIDEO_DEV && PCI && I2C && INPUT
|
||||
select VIDEOBUF_DMA_SG
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select CRC32
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ config VIDEO_TLG2300
|
|||
depends on VIDEO_DEV && I2C && INPUT && SND && DVB_CORE
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_IR
|
||||
depends on VIDEO_IR
|
||||
select VIDEOBUF_VMALLOC
|
||||
select SND_PCM
|
||||
select VIDEOBUF_DVB
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
*/
|
||||
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/slab.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче