diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 12:10:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 12:10:20 -0400 |
| commit | d0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch) | |
| tree | 105651af2db033de4803b91cc029381a1b9b39d2 /drivers/media/dvb/Kconfig | |
| parent | bfd68594082d8384781c242aa72a7950b5cf51aa (diff) | |
| parent | ff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff) | |
Merge with linus
Diffstat (limited to 'drivers/media/dvb/Kconfig')
| -rw-r--r-- | drivers/media/dvb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index 883ec08490f4..4983e1b1bb1d 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig | |||
| @@ -33,7 +33,7 @@ source "drivers/media/dvb/dibusb/Kconfig" | |||
| 33 | source "drivers/media/dvb/cinergyT2/Kconfig" | 33 | source "drivers/media/dvb/cinergyT2/Kconfig" |
| 34 | 34 | ||
| 35 | comment "Supported FlexCopII (B2C2) Adapters" | 35 | comment "Supported FlexCopII (B2C2) Adapters" |
| 36 | depends on DVB_CORE && PCI | 36 | depends on DVB_CORE && (PCI || USB) |
| 37 | source "drivers/media/dvb/b2c2/Kconfig" | 37 | source "drivers/media/dvb/b2c2/Kconfig" |
| 38 | 38 | ||
| 39 | comment "Supported BT878 Adapters" | 39 | comment "Supported BT878 Adapters" |