diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-03 15:03:02 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-03 15:03:02 +0200 |
commit | a8cac817764a494705aebd99fd51bdf6cdc28ec9 (patch) | |
tree | 202847337f42b188755a53a7b57b502a7cdc0ad3 /drivers/media/dvb/ttpci/Kconfig | |
parent | b4b3bd96f26586e53ab5482f1869221dd1b5ac36 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge commit 'v2.6.26-rc8' into x86/mce
Diffstat (limited to 'drivers/media/dvb/ttpci/Kconfig')
-rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index ae882432dd3..d4339b1b3b6 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig @@ -5,6 +5,7 @@ config TTPCI_EEPROM config DVB_AV7110 tristate "AV7110 cards" depends on DVB_CORE && PCI && I2C + depends on HOTPLUG select FW_LOADER if !DVB_AV7110_FIRMWARE select TTPCI_EEPROM select VIDEO_SAA7146_VV @@ -123,6 +124,7 @@ config DVB_BUDGET_AV depends on DVB_BUDGET_CORE && I2C select VIDEO_SAA7146_VV depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV + depends on HOTPLUG # dependency of FW_LOADER select DVB_PLL if !DVB_FE_CUSTOMISE select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_TDA1004X if !DVB_FE_CUSTOMISE |