diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/media/dvb/ttpci/Kconfig | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
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 ae882432dd3d..d4339b1b3b68 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
| @@ -5,6 +5,7 @@ config TTPCI_EEPROM | |||
| 5 | config DVB_AV7110 | 5 | config DVB_AV7110 |
| 6 | tristate "AV7110 cards" | 6 | tristate "AV7110 cards" |
| 7 | depends on DVB_CORE && PCI && I2C | 7 | depends on DVB_CORE && PCI && I2C |
| 8 | depends on HOTPLUG | ||
| 8 | select FW_LOADER if !DVB_AV7110_FIRMWARE | 9 | select FW_LOADER if !DVB_AV7110_FIRMWARE |
| 9 | select TTPCI_EEPROM | 10 | select TTPCI_EEPROM |
| 10 | select VIDEO_SAA7146_VV | 11 | select VIDEO_SAA7146_VV |
| @@ -123,6 +124,7 @@ config DVB_BUDGET_AV | |||
| 123 | depends on DVB_BUDGET_CORE && I2C | 124 | depends on DVB_BUDGET_CORE && I2C |
| 124 | select VIDEO_SAA7146_VV | 125 | select VIDEO_SAA7146_VV |
| 125 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV | 126 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV |
| 127 | depends on HOTPLUG # dependency of FW_LOADER | ||
| 126 | select DVB_PLL if !DVB_FE_CUSTOMISE | 128 | select DVB_PLL if !DVB_FE_CUSTOMISE |
| 127 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 129 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
| 128 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 130 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |