Commit 1547ac89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a30bfd6c 2b80163c

drivers/media/IR/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/dvb/dm1105/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/dvb/dvb-usb/Kconfig

+1 −1
Original line number Diff line number Diff line 
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.

drivers/media/dvb/siano/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/media/dvb/ttpci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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