Commit 2faae422 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (117 commits)
  V4L/DVB (13851): Fix Input dependency for Mantis
  V4L/DVB(13824a): mantis: Fix __devexit bad annotations
  V4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32)
  V4L/DVB (13808): [Mantis/Hopper] Build update for Mantis/Hopper based cards
  V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions
  V4L/DVB (13812): [Mantis/Hopper] Update Copyright header
  V4L/DVB (13811): [MB86A16] Update Copyright header
  V4L/DVB (13810): [MB86A16] Use DVB_* macros
  V4L/DVB (13809): Fix Checkpatch violations
  V4L/DVB (13807): Fix: Free device in the device registration failure case
  V4L/DVB (13806): Register and Initialize Remote control
  V4L/DVB (13805): Fix: Unregister the frontend before detaching
  V4L/DVB (13804): Remove unused I2C Adapter ID
  V4L/DVB (13803): Remove unused dependency on CU1216
  V4L/DVB (13802): [Mantis/Hopper] Fix all build related warnings
  V4L/DVB (13801): [MB86A16] Use the search callback
  V4L/DVB (13800): [Mantis] I2C optimization. Required delay is much lesser than 1mS.
  V4L/DVB (13799): [Mantis] Unregister frontend
  V4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant devices
  V4L/DVB (13797): [Mantis/Hopper/TDA665x] Large overhaul,
  ...
parents 630ca048 fcd89de3

drivers/media/dvb/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ comment "Supported Earthsoft PT1 Adapters" 
	depends on DVB_CORE && PCI && I2C

source "drivers/media/dvb/pt1/Kconfig"



comment "Supported Mantis Adapters"

	depends on DVB_CORE && PCI && I2C

	source "drivers/media/dvb/mantis/Kconfig"



comment "Supported DVB Frontends"

	depends on DVB_CORE

source "drivers/media/dvb/frontends/Kconfig"

drivers/media/dvb/Makefile

+13 −1
Original line number Diff line number Diff line
@@ -2,6 +2,18 @@ 
# Makefile for the kernel multimedia device drivers.

#



obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/ pt1/

obj-y        := dvb-core/	\

		frontends/	\

		ttpci/		\

		ttusb-dec/	\

		ttusb-budget/	\

		b2c2/		\

		bt8xx/		\

		dvb-usb/	\

		pluto2/		\

		siano/		\

		dm1105/		\

		pt1/		\

		mantis/



obj-$(CONFIG_DVB_FIREDTV)	+= firewire/

drivers/media/dvb/frontends/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -208,6 +208,14 @@ config DVB_DS3000 
	help

	  A DVB-S/S2 tuner module. Say Y when you want to support this frontend.



config DVB_MB86A16

	tristate "Fujitsu MB86A16 based"

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A DVB-S/DSS Direct Conversion reveiver.

	  Say Y when you want to support this frontend.



comment "DVB-T (terrestrial) frontends"

	depends on DVB_CORE
@@ -587,6 +595,17 @@ config DVB_ATBM8830 
	help

	  A DMB-TH tuner module. Say Y when you want to support this frontend.



config DVB_TDA665x

	tristate "TDA665x tuner"

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	help

	  Support for tuner modules based on Philips TDA6650/TDA6651 chips.

	  Say Y when you want to support this chip.



	  Currently supported tuners:

	  * Panasonic ENV57H12D5 (ET-50DT)



comment "Tools to develop new frontends"



config DVB_DUMMY_FE

drivers/media/dvb/frontends/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ obj-$(CONFIG_DVB_TDA10048) += tda10048.o 
obj-$(CONFIG_DVB_TUNER_CX24113) += cx24113.o

obj-$(CONFIG_DVB_S5H1411) += s5h1411.o

obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o

obj-$(CONFIG_DVB_TDA665x) += tda665x.o

obj-$(CONFIG_DVB_LGS8GXX) += lgs8gxx.o

obj-$(CONFIG_DVB_ATBM8830) += atbm8830.o

obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o
@@ -80,3 +81,4 @@ obj-$(CONFIG_DVB_STV6110x) += stv6110x.o 
obj-$(CONFIG_DVB_ISL6423) += isl6423.o

obj-$(CONFIG_DVB_EC100) += ec100.o

obj-$(CONFIG_DVB_DS3000) += ds3000.o

obj-$(CONFIG_DVB_MB86A16) += mb86a16.o

drivers/media/dvb/frontends/mb86a16.c

0 → 100644
+1878 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE