diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/media/dvb/ttusb-budget | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/dvb/ttusb-budget')
| -rw-r--r-- | drivers/media/dvb/ttusb-budget/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/dvb/ttusb-budget/Kconfig index 92c7cdcf8981..46a6a60d2ab9 100644 --- a/drivers/media/dvb/ttusb-budget/Kconfig +++ b/drivers/media/dvb/ttusb-budget/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config DVB_TTUSB_BUDGET | 1 | config DVB_TTUSB_BUDGET |
| 2 | tristate "Technotrend/Hauppauge Nova-USB devices" | 2 | tristate "Technotrend/Hauppauge Nova-USB devices" |
| 3 | depends on DVB_CORE && USB | 3 | depends on DVB_CORE && USB && I2C |
| 4 | select DVB_PLL | ||
| 4 | select DVB_CX22700 | 5 | select DVB_CX22700 |
| 5 | select DVB_TDA1004X | 6 | select DVB_TDA1004X |
| 6 | select DVB_VES1820 | 7 | select DVB_VES1820 |