diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/Kconfig | 15 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/Makefile | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Makefile | 16 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-budget/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/Kconfig | 2 |
5 files changed, 19 insertions, 18 deletions
diff --git a/linux/drivers/media/dvb/Kconfig b/linux/drivers/media/dvb/Kconfig index c251f705e..7a674193f 100644 --- a/linux/drivers/media/dvb/Kconfig +++ b/linux/drivers/media/dvb/Kconfig @@ -37,11 +37,16 @@ comment "Supported SAA7146 based PCI Adapters" source "drivers/media/dvb/ttpci/Kconfig" -#comment "Supported USB Adapters" -# depends on DVB && USB -# -#source "drivers/media/dvb/ttusb-budget/Kconfig" -#source "drivers/media/dvb/ttusb-dec/Kconfig" +comment "Supported BT8xx based PCI Adapters" + depends on DVB && PCI + +source "drivers/media/dvb/bt8xx/Kconfig" + +comment "Supported USB Adapters" + depends on DVB && USB + +source "drivers/media/dvb/ttusb-budget/Kconfig" +source "drivers/media/dvb/ttusb-dec/Kconfig" endmenu diff --git a/linux/drivers/media/dvb/Makefile b/linux/drivers/media/dvb/Makefile index a0283c4f6..9e88f3fc9 100644 --- a/linux/drivers/media/dvb/Makefile +++ b/linux/drivers/media/dvb/Makefile @@ -2,4 +2,4 @@ # Makefile for the kernel multimedia device drivers. # -obj-y := dvb-core/ frontends/ ttpci/ # ttusb-dec/ ttusb-budget/ +obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ bt8xx/ diff --git a/linux/drivers/media/dvb/ttpci/Makefile b/linux/drivers/media/dvb/ttpci/Makefile index da44ce79d..317e401be 100644 --- a/linux/drivers/media/dvb/ttpci/Makefile +++ b/linux/drivers/media/dvb/ttpci/Makefile @@ -3,16 +3,12 @@ # and the AV7110 DVB device driver # -dvb-ttpci-budget-objs := budget-core.o budget.o ttpci-eeprom.o -dvb-ttpci-budget-av-objs := budget-core.o budget-av.o ttpci-eeprom.o -dvb-ttpci-budget-ci-objs := budget-core.o budget-ci.o ttpci-eeprom.o -dvb-ttpci-budget-patch-objs := budget-core.o budget-patch.o ttpci-eeprom.o -dvb-ttpci-objs := av7110.o av7110_ipack.o av7110_ir.o ttpci-eeprom.o +dvb-ttpci-objs := av7110.o av7110_ipack.o av7110_ir.o -obj-$(CONFIG_DVB_BUDGET) += dvb-ttpci-budget.o -obj-$(CONFIG_DVB_BUDGET_CI) += dvb-ttpci-budget-ci.o -obj-$(CONFIG_DVB_BUDGET_AV) += dvb-ttpci-budget-av.o -obj-$(CONFIG_DVB_BUDGET_PATCH) += dvb-ttpci-budget-patch.o -obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o +obj-$(CONFIG_DVB_BUDGET) += budget-core.o budget.o ttpci-eeprom.o +obj-$(CONFIG_DVB_BUDGET_AV) += budget-core.o budget-av.o ttpci-eeprom.o +obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o budget-ci.o ttpci-eeprom.o +obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o budget-patch.o ttpci-eeprom.o +obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ diff --git a/linux/drivers/media/dvb/ttusb-budget/Kconfig b/linux/drivers/media/dvb/ttusb-budget/Kconfig index e253233f9..c8bbbcc68 100644 --- a/linux/drivers/media/dvb/ttusb-budget/Kconfig +++ b/linux/drivers/media/dvb/ttusb-budget/Kconfig @@ -1,5 +1,5 @@ config DVB_TTUSB_BUDGET - tristate "Technotrend/Hauppauge Nova-USB device suppport" + tristate "Technotrend/Hauppauge Nova-USB devices" depends on DVB_CORE && USB help Support for external USB adapters designed by Technotrend and diff --git a/linux/drivers/media/dvb/ttusb-dec/Kconfig b/linux/drivers/media/dvb/ttusb-dec/Kconfig index 7d6ffe314..23d066092 100644 --- a/linux/drivers/media/dvb/ttusb-dec/Kconfig +++ b/linux/drivers/media/dvb/ttusb-dec/Kconfig @@ -1,5 +1,5 @@ config DVB_TTUSB_DEC - tristate "Technotrend/Hauppauge USB DEC2000-T device suppport" + tristate "Technotrend/Hauppauge USB DEC2000-T devices" depends on DVB_CORE && USB help Support for external USB adapters designed by Technotrend and |