diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 12:17:19 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 12:19:31 -0400 |
| commit | 9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch) | |
| tree | 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /drivers/media/dvb/b2c2/Kconfig | |
| parent | 3c6c65f5ed5a6d307bd607aecd06d658c0934d88 (diff) | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 (diff) | |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/media/dvb/b2c2/Kconfig')
| -rw-r--r-- | drivers/media/dvb/b2c2/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig index d7f1fd5b7b02..49a06fc54c51 100644 --- a/drivers/media/dvb/b2c2/Kconfig +++ b/drivers/media/dvb/b2c2/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config DVB_B2C2_FLEXCOP | 1 | config DVB_B2C2_FLEXCOP |
| 2 | tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" | 2 | tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" |
| 3 | depends on DVB_CORE && I2C | 3 | depends on DVB_CORE && I2C |
| 4 | select DVB_PLL | ||
| 4 | select DVB_STV0299 | 5 | select DVB_STV0299 |
| 5 | select DVB_MT352 | 6 | select DVB_MT352 |
| 6 | select DVB_MT312 | 7 | select DVB_MT312 |