diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/media/dvb/ttpci/Kconfig | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/media/dvb/ttpci/Kconfig')
| -rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index 87c973ac668b..41b5a988b619 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
| @@ -5,8 +5,6 @@ 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 | ||
| 9 | select FW_LOADER if !DVB_AV7110_FIRMWARE | ||
| 10 | select TTPCI_EEPROM | 8 | select TTPCI_EEPROM |
| 11 | select VIDEO_SAA7146_VV | 9 | select VIDEO_SAA7146_VV |
| 12 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV | 10 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV |
| @@ -127,14 +125,12 @@ config DVB_BUDGET_AV | |||
| 127 | depends on DVB_BUDGET_CORE && I2C | 125 | depends on DVB_BUDGET_CORE && I2C |
| 128 | select VIDEO_SAA7146_VV | 126 | select VIDEO_SAA7146_VV |
| 129 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV | 127 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV |
| 130 | depends on HOTPLUG # dependency of FW_LOADER | ||
| 131 | select DVB_PLL if !DVB_FE_CUSTOMISE | 128 | select DVB_PLL if !DVB_FE_CUSTOMISE |
| 132 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 129 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
| 133 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 130 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |
| 134 | select DVB_TDA10021 if !DVB_FE_CUSTOMISE | 131 | select DVB_TDA10021 if !DVB_FE_CUSTOMISE |
| 135 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE | 132 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE |
| 136 | select DVB_TUA6100 if !DVB_FE_CUSTOMISE | 133 | select DVB_TUA6100 if !DVB_FE_CUSTOMISE |
| 137 | select FW_LOADER | ||
| 138 | help | 134 | help |
| 139 | Support for simple SAA7146 based DVB cards | 135 | Support for simple SAA7146 based DVB cards |
| 140 | (so called Budget- or Nova-PCI cards) without onboard | 136 | (so called Budget- or Nova-PCI cards) without onboard |